diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake
index 66b0d43c1..90f57d6bb 100644
--- a/cmake/mission_build.cmake
+++ b/cmake/mission_build.cmake
@@ -280,7 +280,7 @@ function(prepare)
   )
 
   # Generate the tools for the native (host) arch
-  add_subdirectory(${MISSION_SOURCE_DIR}/tools tools)
+  add_subdirectory(${MISSION_SOURCE_DIR}/tools ${MISSION_BINARY_DIR}/tools)
 
   # Add a dependency on the table generator tool as this is required for table builds
   # The "elf2cfetbl" target should have been added by the "tools" above
diff --git a/cmake/target/src/target_config.c b/cmake/target/src/target_config.c
index f15233450..4b7f95717 100644
--- a/cmake/target/src/target_config.c
+++ b/cmake/target/src/target_config.c
@@ -53,6 +53,7 @@
 #ifndef CFE_SPACECRAFT_ID_VALUE
 #define CFE_SPACECRAFT_ID_VALUE     0x42
 #endif
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
 
 Target_CfeConfigData GLOBAL_CFE_CONFIGDATA =
diff --git a/fsw/cfe-core/src/es/cfe_es_perf.c b/fsw/cfe-core/src/es/cfe_es_perf.c
index 308514d20..d1d992a36 100644
--- a/fsw/cfe-core/src/es/cfe_es_perf.c
+++ b/fsw/cfe-core/src/es/cfe_es_perf.c
@@ -42,6 +42,7 @@
 #include "cfe_psp.h"
 #include <string.h>
 
+#pragma GCC diagnostic ignored "-Wtype-limits"
 
 /*
 ** Pointer to performance log in the reset area
diff --git a/fsw/cfe-core/src/fs/cfe_fs_decompress.c b/fsw/cfe-core/src/fs/cfe_fs_decompress.c
index 5e2a4d5ae..d82409566 100644
--- a/fsw/cfe-core/src/fs/cfe_fs_decompress.c
+++ b/fsw/cfe-core/src/fs/cfe_fs_decompress.c
@@ -44,6 +44,8 @@
 ** Includes
 */
 #include "cfe_fs_decompress.h"
+#pragma GCC diagnostic ignored "-Wtype-limits"
+
 
 #ifndef CFE_OMIT_DEPRECATED_6_7 /* Entire file will be removed in major release */
 
diff --git a/fsw/cfe-core/unit-test/sb_UT.c b/fsw/cfe-core/unit-test/sb_UT.c
index 2f2ffcf1a..ec7b8c3ab 100644
--- a/fsw/cfe-core/unit-test/sb_UT.c
+++ b/fsw/cfe-core/unit-test/sb_UT.c
@@ -39,6 +39,7 @@
 ** Includes
 */
 #include "sb_UT.h"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 /*
  * A method to add an SB "Subtest"