diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index af13b7d8c..3f1fb8f9d 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -593,7 +593,7 @@ void CMakeSetupDialog::FillCacheGUIFromCacheManager()
           m_CacheEntriesList.AddProperty(key,
                                          "ON",
                                          value.m_HelpString.c_str(),
-                                         CPropertyList::CHECKBOX,"",
+                                         CPropertyList::COMBO,"ON|OFF",
                                          reverseOrder 
             );
           }
@@ -602,7 +602,7 @@ void CMakeSetupDialog::FillCacheGUIFromCacheManager()
           m_CacheEntriesList.AddProperty(key,
                                          "OFF",
                                          value.m_HelpString.c_str(),
-                                         CPropertyList::CHECKBOX,"",
+                                         CPropertyList::COMBO,"ON|OFF",
                                          reverseOrder
             );
           }
diff --git a/Source/cmaketest.cxx b/Source/cmaketest.cxx
index eae304698..7a4e2157c 100644
--- a/Source/cmaketest.cxx
+++ b/Source/cmaketest.cxx
@@ -126,5 +126,6 @@ int main (int argc, char *argv[])
   
   // return to the original directory
   cmSystemTools::ChangeDirectory(cwd.c_str());
+  cmMakefileGenerator::UnRegisterGenerators();
   return 0;
 }