diff --git a/buildsupport/macros_and_definitions.cmake b/buildsupport/macros_and_definitions.cmake
index 35d756332..68e5bcd0b 100644
--- a/buildsupport/macros_and_definitions.cmake
+++ b/buildsupport/macros_and_definitions.cmake
@@ -386,7 +386,7 @@ macro(process_options)
       ExternalProject_Add(
         ClangBuildAnalyzer
         GIT_REPOSITORY "https://github.com/aras-p/ClangBuildAnalyzer.git"
-        GIT_TAG "5d40542c5b2080637206e9d51e2957d0017ba8b3"
+        GIT_TAG "47406981a1c5a89e8f8c62802b924c3e163e7cb4"
         INSTALL_COMMAND cmake -E copy_if_different ClangBuildAnalyzer
                         ${PROJECT_BINARY_DIR}
       )
diff --git a/ns3 b/ns3
index f1ad1f0ac..497829210 100755
--- a/ns3
+++ b/ns3
@@ -816,6 +816,7 @@ def build_step(args,
                                   "sphinx",
                                   "manual",
                                   "models",
+                                  "timeTraceReport",
                                   "tutorial",
                                   "contributing",
                                   "install",
@@ -894,7 +895,7 @@ def run_step(args, target_to_run, target_args):
 
         # running valgrind?
         if args.valgrind:
-            debugging_software.append(shutil.which("valgrind"))
+            debugging_software.extend([shutil.which("valgrind"), "--leak-check=full"])
 
         # running gdb?
         if args.gdb: