diff --git a/Code/LauncherUnified/launcher_generator.cmake b/Code/LauncherUnified/launcher_generator.cmake
index edb6655411..c5d60eb29e 100644
--- a/Code/LauncherUnified/launcher_generator.cmake
+++ b/Code/LauncherUnified/launcher_generator.cmake
@@ -179,6 +179,7 @@ function(ly_delayed_generate_static_modules_inl)
                 ${launcher_unified_binary_dir}/${project_name}.GameLauncher/Includes/StaticModules.inl
             )
 
+            ly_target_link_libraries(${project_name}.GameLauncher PRIVATE ${all_game_gem_dependencies})
             if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
                 get_property(server_gem_dependencies GLOBAL PROPERTY LY_STATIC_MODULE_PROJECTS_DEPENDENCIES_${project_name}.ServerLauncher)
 
@@ -204,6 +205,7 @@ function(ly_delayed_generate_static_modules_inl)
                     ${launcher_unified_binary_dir}/${project_name}.ServerLauncher/Includes/StaticModules.inl
                 )
 
+                ly_target_link_libraries(${project_name}.ServerLauncher PRIVATE ${all_server_gem_dependencies})
             endif()
         endforeach()
     endif()
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt
index de4ee9b4b5..0f134d4218 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt
@@ -10,7 +10,7 @@
 #
 
 ly_add_target(
-    NAME AtomViewportDisplayInfo GEM_MODULE
+    NAME AtomViewportDisplayInfo ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
     FILES_CMAKE
         atomviewportdisplayinfo_files.cmake
diff --git a/cmake/Tools/common.py b/cmake/Tools/common.py
index 8189bb3ca3..c6a3e89e67 100755
--- a/cmake/Tools/common.py
+++ b/cmake/Tools/common.py
@@ -149,7 +149,7 @@ def get_bootstrap_values(bootstrap_dir, keys_to_extract):
         raise logging.error(f'Bootstrap.setreg file {bootstrap_file} does not exist.')
     
     result_map = {}
-    with bootstrap_file.open('r') as f:
+    with open(bootstrap_file, 'r') as f:
         try:
             json_data = json.load(f)
         except Exception as e:
@@ -157,9 +157,9 @@ def get_bootstrap_values(bootstrap_dir, keys_to_extract):
         else:
             for search_key in keys_to_extract:
                 try:
-                    search_result = json_data["Amazon"]["AzCore"]["Bootstrap"][f'"{search_key}"']
+                    search_result = json_data["Amazon"]["AzCore"]["Bootstrap"][search_key]
                 except KeyError as e:
-                    logging.error(f'Bootstrap.setreg cannot find Amazon:AzCore:Bootstrap:{search_result}: {str(e)}')
+                    logging.warning(f'Bootstrap.setreg cannot find /Amazon/AzCore/Bootstrap/{search_key}: {str(e)}')
                 else:
                     result_map[search_key] = search_result
     
diff --git a/cmake/Tools/layout_tool.py b/cmake/Tools/layout_tool.py
index 69f5b34ae7..3fcab241d7 100755
--- a/cmake/Tools/layout_tool.py
+++ b/cmake/Tools/layout_tool.py
@@ -107,7 +107,7 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
     project_name_lower = project_path.lower()
     layout_path = pathlib.Path(layout_dir)
 
-    bootstrap_path = layout_path / 'Registry'
+    bootstrap_path = pathlib.Path(ROOT_ENGINE_PATH) / 'Registry'
     bootstrap_values = common.get_bootstrap_values(str(bootstrap_path), [f'{platform_name_lower}_remote_filesystem',
                                                                          f'{platform_name_lower}_connect_to_remote',
                                                                          f'{platform_name_lower}_wait_for_connect',