diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bdb9fbb..281a14f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,12 +53,9 @@ elseif(BUILD_QEMU)
 elseif(BUILD_T32)
   include_directories(debuggers/t32/include src/core)
   add_subdirectory(debuggers/t32)
+  add_subdirectory(scripts/t32cmm)
 endif(BUILD_BOCHS)
 
-## Additional compiler and linker flags ##
-set(CMAKE_C_FLAGS "-g -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") 
-set(CMAKE_EXE_LINKER_FLAGS "-Wl,-gc-sections")
 ## Tell the linker where to find the Fail* libraries
 link_directories("${LIBRARY_OUTPUT_PATH}")
 
diff --git a/cmake/compilerconfig.cmake b/cmake/compilerconfig.cmake
index c2494244..7122892c 100644
--- a/cmake/compilerconfig.cmake
+++ b/cmake/compilerconfig.cmake
@@ -2,28 +2,16 @@
 option( VERBOSE_MAKE "Verbose Makefile output" OFF) # defaults to OFF
 	set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE_MAKE})
 
+### Additional compiler and linker flags ##
+set(CMAKE_C_FLAGS "-g -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "-Wl,-gc-sections")
 
-##### Compilers #####
-SET( COMPILER "ag++" CACHE STRING "Use clang/gcc/ag++") # Defaults to ag++
-
-if(${COMPILER} STREQUAL "clang")
-  set(CMAKE_C_COMPILER "clang")
-  set(CMAKE_CXX_COMPILER "clang++")
-
-elseif(${COMPILER} STREQUAL "gcc")
-  set(CMAKE_C_COMPILER "gcc")
-  set(CMAKE_CXX_COMPILER "g++")
-
-elseif(${COMPILER} STREQUAL "ag++")
-  set(CMAKE_C_COMPILER "ag++")
-  set(CMAKE_CXX_COMPILER "ag++")
-  set(CMAKE_AGPP_FLAGS "--real-instances" CACHE STRING "Additional ag++ flags, e.g. --real-instances --keep_woven")
+set(CMAKE_C_COMPILER "gcc")
+set(CMAKE_CXX_COMPILER "ag++")
+set(CMAKE_AGPP_FLAGS "--real-instances" CACHE STRING "Additional ag++ flags, e.g. --real-instances --keep_woven")
   ## Here we add the build dir holding the generated header files (protobuf)
-  add_definitions("-p ${CMAKE_SOURCE_DIR}" ${CMAKE_AGPP_FLAGS} --Xcompiler)
-
-else(${COMPILER} STREQUAL "clang")
-  message(FATAL_ERROR "COMPILER must be exactly one of clang/gcc/ag++.  If unsure, use 'ag++'.")
-endif(${COMPILER} STREQUAL "clang")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --Xweaver -p ${CMAKE_SOURCE_DIR} ${CMAKE_AGPP_FLAGS} --Xcompiler")
 
 add_definitions(-D_FILE_OFFSET_BITS=64)
 
diff --git a/src/experiments/kesorefs/experiment.hpp b/src/experiments/kesorefs/experiment.hpp
index 0f3f5b25..890aff59 100644
--- a/src/experiments/kesorefs/experiment.hpp
+++ b/src/experiments/kesorefs/experiment.hpp
@@ -7,6 +7,7 @@
 #include "efw/JobClient.hpp"
 #include "util/Logger.hpp"
 #include "util/ElfReader.hpp"
+#include "util/Disassembler.hpp"
 #include <string>
 
 class KESOrefs : public fail::ExperimentFlow {