diff --git a/Source/build.cpp b/Source/build.cpp
index 7b408e65..48796a74 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -2196,7 +2196,7 @@ int CEXEBuild::write_output(void)
       DefineInnerLangString(NLF_UCAPTION);
       if (resolve_coderefs("uninstall"))
         return PS_ERROR;
-#ifdef NSIS_CONFIG_VISIBLE_SUPPORT 
+#ifdef NSIS_CONFIG_COMPONENTPAGE 
       // set sections to the first insttype
       PreperInstTypes();
 #endif
@@ -2214,7 +2214,7 @@ int CEXEBuild::write_output(void)
   if (resolve_coderefs("install"))
     return PS_ERROR;
 
-#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
+#ifdef NSIS_CONFIG_COMPONENTPAGE
   // set sections to the first insttype
   PreperInstTypes();
 #endif
diff --git a/Source/script.cpp b/Source/script.cpp
index 0aaf9857..73d41979 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -782,7 +782,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
     HKEY_CLASSES_ROOT,HKEY_LOCAL_MACHINE,HKEY_CURRENT_USER,HKEY_USERS,HKEY_CURRENT_CONFIG,HKEY_DYN_DATA,HKEY_PERFORMANCE_DATA
   };
 
+#ifdef NSIS_CONFIG_PLUGIN_SUPPORT
   build_plugin_table();
+#endif
 
   entry ent={0,};
   switch (which_token)
@@ -3729,7 +3731,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
     case TOK_SENDMESSAGE:
     case TOK_FINDWINDOW:
     case TOK_GETDLGITEM:
-    case TOK_SETBKCOLOR:
+    case TOK_SETCTLCOLORS:
     case TOK_SHOWWINDOW:
     case TOK_ENABLEWINDOW:
     case TOK_CREATEFONT: