diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt
index d8baea6e3c..2de43d93cb 100644
--- a/launchers/darwin/CMakeLists.txt
+++ b/launchers/darwin/CMakeLists.txt
@@ -66,6 +66,10 @@ endfunction()
 add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME})
 set_from_env(LAUNCHER_HMAC_SECRET LAUNCHER_HMAC_SECRET "")
+if (LAUNCHER_HMAC_SECRET STREQUAL "")
+    message(FATAL_ERROR "LAUNCHER_HMAC_SECRET is not set")
+endif()
+
 target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}")
 
 file(GLOB NIB_FILES "nib/*.xib")
diff --git a/launchers/win32/CMakeLists.txt b/launchers/win32/CMakeLists.txt
index 8417831312..a472c68688 100644
--- a/launchers/win32/CMakeLists.txt
+++ b/launchers/win32/CMakeLists.txt
@@ -50,6 +50,11 @@ function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE)
 endfunction()
 
 set_from_env(LAUNCHER_HMAC_SECRET LAUNCHER_HMAC_SECRET "")
+
+if (LAUNCHER_HMAC_SECRET STREQUAL "")
+    message(FATAL_ERROR "LAUNCHER_HMAC_SECRET is not set")
+endif()
+
 target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}")
 
 
diff --git a/tools/ci-scripts/postbuild.py b/tools/ci-scripts/postbuild.py
index b6593b1cf3..4c05abeb47 100644
--- a/tools/ci-scripts/postbuild.py
+++ b/tools/ci-scripts/postbuild.py
@@ -112,9 +112,6 @@ def fixupWinZip(filename):
     shutil.move(outFullPath, fullPath)
 
 def buildLightLauncher():
-    # FIXME remove once MFC is enabled on the windows build hosts
-    if sys.platform == 'win32':
-        return
     launcherSourcePath = os.path.join(SOURCE_PATH, 'launchers', sys.platform)
     launcherBuildPath = os.path.join(BUILD_PATH, 'launcher') 
     if not os.path.exists(launcherBuildPath):
@@ -146,7 +143,7 @@ def buildLightLauncher():
     elif sys.platform == 'win32':
         # FIXME
         launcherDestFile = os.path.join(BUILD_PATH, "{}.exe".format(computeArchiveName('Launcher')))
-        launcherSourceFile = os.path.join(launcherBuildPath, "Launcher.exe")
+        launcherSourceFile = os.path.join(launcherBuildPath, "Release", "HQLauncher.exe")
     print("Moving {} to {}".format(launcherSourceFile, launcherDestFile))
     shutil.move(launcherSourceFile, launcherDestFile)