diff --git a/External/SPIRV-Cross b/External/SPIRV-Cross
index adcda90d..bcc96d8c 160000
--- a/External/SPIRV-Cross
+++ b/External/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit adcda90d344346ef17cf8386c0ac63af828cf83f
+Subproject commit bcc96d8c7011d5be504174ddbbadcacad227ea89
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
index 5b069522..9b90eb10 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -78,15 +78,15 @@ void MVKPhysicalDevice::getProperties(VkPhysicalDeviceProperties* properties) {
 #define MVK_FMT_NO_FEATS		{ 0, 0, 0 }
 
 void MVKPhysicalDevice::getFormatProperties(VkFormat format,
-                                                VkFormatProperties* pFormatProperties) {
+                                            VkFormatProperties* pFormatProperties) {
     if ( !pFormatProperties ) { return; }
-    
+
     *pFormatProperties = mvkVkFormatProperties(format);
-    
+
 #if MVK_MACOS
-    // Special-case certain formats that not all macOS GPU's support
-    MTLPixelFormat mtlPixFmt = mvkMTLPixelFormatFromVkFormat(format);
-    if (mtlPixFmt == MTLPixelFormatDepth24Unorm_Stencil8 &&
+    // Special-case certain formats that not all macOS GPU's support.
+    // Lookup from Metal to Vulkan to avoid logging error message when going the other way.
+    if (format == mvkVkFormatFromMTLPixelFormat(MTLPixelFormatDepth24Unorm_Stencil8) &&
         !getMTLDevice().isDepth24Stencil8PixelFormatSupported) {
         *pFormatProperties = MVK_FMT_NO_FEATS;
     }
diff --git a/MoltenVK/MoltenVK/Vulkan/vk_mvk_moltenvk.mm b/MoltenVK/MoltenVK/Vulkan/vk_mvk_moltenvk.mm
index 0ce6eb52..a86e8e99 100644
--- a/MoltenVK/MoltenVK/Vulkan/vk_mvk_moltenvk.mm
+++ b/MoltenVK/MoltenVK/Vulkan/vk_mvk_moltenvk.mm
@@ -77,11 +77,11 @@ MVK_PUBLIC_SYMBOL void vkGetVersionStringsMVK(
     size_t len;
 
     string mvkVer;
-    mvkVer += to_string((MVK_VERSION >> 24) & 0xFF);
+    mvkVer += to_string(MVK_VERSION / 10000);
     mvkVer += ".";
-    mvkVer += to_string((MVK_VERSION >> 16) & 0xFF);
+    mvkVer += to_string((MVK_VERSION % 10000) / 100);
     mvkVer += ".";
-    mvkVer += to_string((MVK_VERSION >> 8) & 0xFF);
+    mvkVer += to_string(MVK_VERSION % 100);
     len = mvkVer.copy(pMoltenVersionStringBuffer, moltenVersionStringBufferLength - 1);
     pMoltenVersionStringBuffer[len] = 0;    // terminator
 
diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
index 6c8cb773..0dfe39f2 100644
--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
+++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
@@ -74,19 +74,19 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-gi"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK/External/SPIRV-Cross/shaders-msl/comp/struct-packing.comp"
-            isEnabled = "YES">
+            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK/External/SPIRV-Cross/shaders-msl/vert/forum_test.vert"
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-si"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK/External/SPIRV-Cross/shaders-msl/frag.spv"
-            isEnabled = "NO">
+            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/functions_nested-opt.spv"
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-mo"
diff --git a/MoltenVKShaderConverter/ThirdPartyConfig.md b/MoltenVKShaderConverter/ThirdPartyConfig.md
index e594df8f..6eb22cd1 100644
--- a/MoltenVKShaderConverter/ThirdPartyConfig.md
+++ b/MoltenVKShaderConverter/ThirdPartyConfig.md
@@ -91,7 +91,7 @@ If you make changes to the `SPIRV-Cross` submodule, you can regression test your
 
 4. Run the regression tests:
 
-		./test_shaders.py --msl shaders-msl
+		./test_shaders.sh
 
 5. If your changes result in different expected output for a reference shader, you can update
    the reference shader for a particular regression test: