diff --git a/bootstrap/build.conf b/bootstrap/build.conf
index af0b3b5a..49b85992 100644
--- a/bootstrap/build.conf
+++ b/bootstrap/build.conf
@@ -24,12 +24,11 @@ projects = [ { 'name'      :   'bootstrap'
                              , "mauka"
                              , "knik"
                              , "katabatic"
-                            #, "katabatic3"
                              , "kite"
                              , "equinox"
                              , "solstice"
                              , "unicorn"
-                             , "testbench"
+                            #, "testbench"
                             #, "ispd"
                              , "cumulus"
                              , "stratus1"
diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake
index fbb6bc2f..8d5009d3 100644
--- a/bootstrap/cmake_modules/FindBootstrap.cmake
+++ b/bootstrap/cmake_modules/FindBootstrap.cmake
@@ -71,10 +71,10 @@
 #
 # Adds -Wall to the C/C++ flags.
 #
- set(CMAKE_C_FLAGS_DEBUG     "-g -Wall"           CACHE STRING "Debug options."   FORCE)
- set(CMAKE_CXX_FLAGS_DEBUG   "-g -Wall"           CACHE STRING "Debug options."   FORCE)
- set(CMAKE_C_FLAGS_RELEASE   "-O2 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
+ set(CMAKE_C_FLAGS_DEBUG                "-Wall -g"           CACHE STRING "C Compiler Debug options."   FORCE)
+ set(CMAKE_C_FLAGS_RELEASE              "-Wall -O2 -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -Wall -g"           CACHE STRING "C++ Compiler Debug options."   FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -Wall -O2 -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE)
 
 
 #
diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py
index 7fd53f96..f3e3aab4 100755
--- a/bootstrap/coriolisEnv.py
+++ b/bootstrap/coriolisEnv.py
@@ -105,6 +105,7 @@ if __name__ == "__main__":
   parser.add_option ( "--devel"    , action="store_true" ,                dest="devel"    )
   parser.add_option ( "--static"   , action="store_true" ,                dest="static"   )
   parser.add_option ( "--shared"   , action="store_true" ,                dest="shared"   )
+  parser.add_option ( "--chams"    , action="store_true" ,                dest="chams"    )
   parser.add_option ( "--no-python", action="store_true" ,                dest="nopython" )
   parser.add_option ( "--root"     , action="store"      , type="string", dest="rootDir"  )
   ( options, args ) = parser.parse_args ()