diff --git a/src/vsg/viewer/Win32_Window.cpp b/src/vsg/viewer/Win32_Window.cpp
index c13b04d02..5f5e720b2 100644
--- a/src/vsg/viewer/Win32_Window.cpp
+++ b/src/vsg/viewer/Win32_Window.cpp
@@ -161,7 +161,7 @@ Win32_Window::Result Win32_Window::create(const Traits& traits, bool debugLayer,
     if (traits.shareWindow)
     {
         // create surface
-        vsg::ref_ptr<vsg::Surface> surface(new vsg::Win32Surface(traits.shareWindow->instance(), hwnd, allocator));
+        vsg::ref_ptr<vsg::Surface> surface(new vsgWin32::Win32Surface(traits.shareWindow->instance(), hwnd, allocator));
 
         window = new Win32_Window(hwnd, traits.shareWindow->instance(), traits.shareWindow->surface(), traits.shareWindow->physicalDevice(), traits.shareWindow->device(), traits.shareWindow->renderPass(), traits.shareWindow->debugLayersEnabled());
 
@@ -194,7 +194,7 @@ Win32_Window::Result Win32_Window::create(const Traits& traits, bool debugLayer,
         if (!instance) return Result("Error: vsg::Win32_Window::create(...) failed to create Window, unable to create Vulkan instance.", VK_ERROR_INVALID_EXTERNAL_HANDLE);
 
         // use GLFW to create surface
-        vsg::ref_ptr<vsg::Surface> surface(new vsg::Win32Surface(instance, hwnd, allocator));
+        vsg::ref_ptr<vsg::Surface> surface(new vsgWin32::Win32Surface(instance, hwnd, allocator));
         if (!surface) return Result("Error: vsg::Win32_Window::create(...) failed to create Window, unable to create Win32Surface.", VK_ERROR_INVALID_EXTERNAL_HANDLE);
 
         // set up device
diff --git a/src/vsg/viewer/Window.cpp b/src/vsg/viewer/Window.cpp
index 41edcbbd0..252e4dbd3 100644
--- a/src/vsg/viewer/Window.cpp
+++ b/src/vsg/viewer/Window.cpp
@@ -176,7 +176,7 @@ namespace vsg
     Window::Result Window::create(const Window::Traits& traits, bool debugLayer, bool apiDumpLayer, vsg::AllocationCallbacks* allocator)
     {
 #ifdef _WIN32
-        ref_ptr<vsg::Window> window = vsg::Win32_Window::create(traits, debugLayer, apiDumpLayer, allocator);
+        ref_ptr<vsg::Window> window = vsgWin32::Win32_Window::create(traits, debugLayer, apiDumpLayer, allocator);
 #else
         ref_ptr<vsg::Window> window = glfw::GLFW_Window::create(traits.width, traits.height, debugLayer, apiDumpLayer, traits.shareWindow, allocator);
 #endif
diff --git a/src/vsg/vk/Extensions.cpp b/src/vsg/vk/Extensions.cpp
index 8d648cccb..5a11cfc37 100644
--- a/src/vsg/vk/Extensions.cpp
+++ b/src/vsg/vk/Extensions.cpp
@@ -52,10 +52,10 @@ bool vsg::isExtensionSupported(const char* extensionName)
 bool vsg::isExtensionListSupported(const Names& extensionList)
 {
     ExtensionProperties extProps = getExtensionProperties();
-    for (auto prop : extProps)
+    for (auto ext : extensionList)
     {
-        auto compare = [&](const char* rhs) { return strcmp(prop.extensionName, rhs)==0; };
-        if (std::find_if(extensionList.begin(), extensionList.end(), compare) == extensionList.end()) return false;
+        auto compare = [&](const VkExtensionProperties& rhs) { return strcmp(ext, rhs.extensionName)==0; };
+        if (std::find_if(extProps.begin(), extProps.end(), compare) == extProps.end()) return false;
     }
     return true;
 }