diff --git a/notify/configure-toolchain.txt b/notify/configure-toolchain.txt
index f3d71a2f3..ccf8155a3 100644
--- a/notify/configure-toolchain.txt
+++ b/notify/configure-toolchain.txt
@@ -3,17 +3,3 @@ Most relevant configure and test flags: none, autodetected on aarch64-unknown-li
 
 Full configure and make flags for each step:
 
-# 03-build_abe-gcc
-(cd /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2 && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gcc.git~master/configure SHELL=/bin/bash  --with-mpc=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu --with-mpfr=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu --with-gmp=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu --with-gnu-as --with-gnu-ld --disable-libmudflap --enable-lto --enable-shared --without-included-gettext --enable-nls --with-system-zlib --disable-sjlj-exceptions --enable-gnu-unique-object --enable-linker-build-id --disable-libstdcxx-pch --enable-c99 --enable-clocale=gnu --enable-libstdcxx-debug --enable-long-long --with-cloog=no --with-ppl=no --with-isl=no --disable-multilib --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 --with-arch=armv8-a --enable-threads=posix --enable-multiarch --enable-libstdcxx-time=yes --enable-gnu-indirect-function --enable-checking=yes --disable-bootstrap --enable-languages=default --prefix=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu )
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2  -j 64 LDFLAGS_FOR_TARGET="-Wl,-fix-cortex-a53-843419"  CFLAGS_FOR_BUILD="-pipe -g -O2" CXXFLAGS_FOR_BUILD="-pipe -g -O2" LDFLAGS_FOR_BUILD="-static-libgcc" MAKEINFOFLAGS=--force 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/make-gcc-stage2.log
-make install  -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/make-gcc-stage2.log
-
-# 04-build_abe-dejagnu
-(cd /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/dejagnu.git~linaro-local~stable/configure SHELL=/bin/bash   --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu --prefix=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/hosttools/aarch64-unknown-linux-gnu)
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable  -j 64 LDFLAGS_FOR_TARGET="-Wl,-fix-cortex-a53-843419"  CFLAGS_FOR_BUILD="-pipe -g -O2" CXXFLAGS_FOR_BUILD="-pipe -g -O2" LDFLAGS_FOR_BUILD="-static-libgcc" 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable/make-dejagnu.log
-make install  -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable/make-dejagnu.log
-
-# 05-build_abe-check_gcc
-make check FLAGS_UNDER_TEST="" PREFIX_UNDER_TEST="/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/scripts/qemu-wrapper.sh QEMU_CPU_UNDER_TEST=any ABE_TEST_CONTAINER=local  CFLAGS_FOR_BUILD="-pipe" CXXFLAGS_FOR_BUILD="-pipe" -j 64  -w -i -k -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-make check-gcc-c++ FLAGS_UNDER_TEST="" PREFIX_UNDER_TEST="/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/scripts/qemu-wrapper.sh QEMU_CPU_UNDER_TEST=any ABE_TEST_CONTAINER=local  CFLAGS_FOR_BUILD="-pipe" CXXFLAGS_FOR_BUILD="-pipe" -j 64 RUNTESTFLAGS=" g++.dg/modules/modules.exp" -w -i -k -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-
diff --git a/notify/fixes.sum b/notify/fixes.sum
index bbe3d5ae0..588defa8b 100644
--- a/notify/fixes.sum
+++ b/notify/fixes.sum
@@ -2,11 +2,11 @@
 
 Running g++:g++.dg/modules/modules.exp ...
 FAIL: g++.dg/modules/class-11_a.H -std=c++14 (test for excess errors)
-FAIL: g++.dg/modules/class-11_b.C -std=c++14 (test for excess errors)
 FAIL: g++.dg/modules/class-11_b.C -std=c++14  (test for warnings, line 10)
+FAIL: g++.dg/modules/class-11_b.C -std=c++14 (test for excess errors)
 
 		=== Results Summary ===
 
 # of stable fails		89
-# of flaky entries		10
+# of flaky entries		1
 # of all tests			956320
diff --git a/notify/lnt_report.json b/notify/lnt_report.json
index dbae34029..10a26d6cc 100644
--- a/notify/lnt_report.json
+++ b/notify/lnt_report.json
@@ -24,7 +24,7 @@
 	   ,
         {
             "Data": [
-                10
+                1
             ],
             "Info": {},
             "Name": "tcwg_gcc_check.TOTAL.flaky.nb_flaky"
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 48d34e7f7..5c9fdf021 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -16,8 +16,8 @@ Produces  3 fixes:
   | fixes.sum:
   | Running g++:g++.dg/modules/modules.exp ...
   | FAIL: g++.dg/modules/class-11_a.H -std=c++14 (test for excess errors)
-  | FAIL: g++.dg/modules/class-11_b.C -std=c++14 (test for excess errors)
   | FAIL: g++.dg/modules/class-11_b.C -std=c++14  (test for warnings, line 10)
+  | FAIL: g++.dg/modules/class-11_b.C -std=c++14 (test for excess errors)
 
 Used configuration :
  *CI config* tcwg_gcc_check master-aarch64
@@ -29,8 +29,8 @@ If you have any questions regarding this report, please ask on linaro-toolchain@
 
 The information below contains the details of the failures, and the ways to reproduce a debug environment:
 
-You can find the failure logs in *.log.1.xz files in
- * https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4058/artifact/artifacts/00-sumfiles/
+You can find the failure logs in
+ * https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4058/artifact/artifacts/
 The full lists of regressions and improvements as well as configure and make commands are in
  * https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4058/artifact/artifacts/notify/
 The list of [ignored] baseline and flaky failures are in
diff --git a/notify/regressions.sum b/notify/regressions.sum
index 6d6945f2b..6034c8e07 100644
--- a/notify/regressions.sum
+++ b/notify/regressions.sum
@@ -2,5 +2,5 @@
 		=== Results Summary ===
 
 # of stable fails		86
-# of flaky entries		10
+# of flaky entries		1
 # of all tests			956320
diff --git a/notify/results-summary.txt b/notify/results-summary.txt
index 2fb4697c9..620e53530 100644
--- a/notify/results-summary.txt
+++ b/notify/results-summary.txt
@@ -1,5 +1,5 @@
 		=== Results Summary ===
 
 # of stable fails		86
-# of flaky entries		10
+# of flaky entries		1
 # of all tests			956320
diff --git a/notify/results.compare.txt b/notify/results.compare.txt
index d933e13e0..d04ea5302 100644
--- a/notify/results.compare.txt
+++ b/notify/results.compare.txt
@@ -1,6 +1,6 @@
 # Comparing directories
 # REFERENCE: base-artifacts/sumfiles
-# CURRENT:   artifacts/sumfiles
+# CURRENT:   artifacts/99-rewrite/artifacts.old/sumfiles
 
 # Comparing 8 common sum files:
 g++.sum
@@ -12,8 +12,8 @@ libitm.sum
 libstdc++.sum
 objc.sum
 Comparing:
-REFERENCE:/tmp/gxx-sum1.2591387
-CURRENT:  /tmp/gxx-sum2.2591387
+REFERENCE:/tmp/gxx-sum1.1608816
+CURRENT:  /tmp/gxx-sum2.1608816
 
                                              +---------+---------+
 o  RUN STATUS:                               |   REF   |   RES   |
