diff --git a/include/iwa/object.hpp b/include/iwa/object.hpp
index 421516f..5a37e2f 100644
--- a/include/iwa/object.hpp
+++ b/include/iwa/object.hpp
@@ -324,6 +324,8 @@ void unregisterObject(BaseObject* object) noexcept;
     }
     return std::string(functionName.substr(begin, end - begin));
 #else
+	(void) sourceLocation;
+	(void) ERROR_NAME;
     return "<unsupported compiler family>";
 #endif
 }
@@ -382,7 +384,7 @@ protected:
     friend class ObjectPtr;
 };
 
-template<typename TConcrete, typename TBase = BaseObject, typename TOwner = TBase::owner_t>
+template<typename TConcrete, typename TBase = BaseObject, typename TOwner = typename TBase::owner_t>
 class Object : public TBase
 {
 public:
diff --git a/include/iwa/type_meta.hpp b/include/iwa/type_meta.hpp
index ed99c1c..870e1f1 100644
--- a/include/iwa/type_meta.hpp
+++ b/include/iwa/type_meta.hpp
@@ -165,6 +165,8 @@ namespace impl
     }
     return std::string(functionName.substr(begin, end - begin));
 #else
+	(void) sourceLocation;
+	(void) ERROR_NAME;
     return "<unsupported compiler family>";
 #endif
 }
diff --git a/source/instance.cpp b/source/instance.cpp
index a60361b..bac2fd6 100644
--- a/source/instance.cpp
+++ b/source/instance.cpp
@@ -33,7 +33,7 @@ void buildDefaultInstanceExtensionList(std::vector<ExtensionInfo>& outExtensions
         outExtensions.push_back({.name = "VK_KHR_xcb_surface", .required = false});
         outExtensions.push_back({.name = "VK_KHR_xlib_surface", .required = false});
 #elif MIJIN_TARGET_OS == MIJIN_OS_WINDOWS
-        g_instanceExtensions.push_back({.name = "VK_KHR_win32_surface", .required = true});
+        outExtensions.push_back({.name = "VK_KHR_win32_surface", .required = true});
 #endif
     }
 }
diff --git a/source/util/shader_meta.cpp b/source/util/shader_meta.cpp
index 88a20c0..1dc1b47 100644
--- a/source/util/shader_meta.cpp
+++ b/source/util/shader_meta.cpp
@@ -101,7 +101,7 @@ void addShaderAttribute(std::vector<ShaderAttribute>& attributes, ShaderAttribut
 ShaderVariableStructType::ShaderVariableStructType() {} // NOLINT(modernize-use-equals-default)
 ShaderVariableStructType::~ShaderVariableStructType() {} // NOLINT(modernize-use-equals-default)
 
-void ShaderMeta::extendPushConstant(ShaderPushConstantBlock pushConstantBlock_, ShaderTypeBits stages)
+void ShaderMeta::extendPushConstant(ShaderPushConstantBlock pushConstantBlock_, ShaderTypeBits pushConstantStages_)
 {
     if (pushConstantBlock_.type.baseType == ShaderVariableBaseType::NONE) {
         return;
@@ -109,14 +109,14 @@ void ShaderMeta::extendPushConstant(ShaderPushConstantBlock pushConstantBlock_,
     if (pushConstantBlock.type.baseType == ShaderVariableBaseType::NONE)
     {
         pushConstantBlock = std::move(pushConstantBlock_);
-        pushConstantStages = stages;
+        pushConstantStages = pushConstantStages_;
         return;
     }
 
     // now comes the actual merging
     assert(pushConstantBlock.type.baseType == ShaderVariableBaseType::STRUCT);
     assert(pushConstantBlock_.type.baseType == ShaderVariableBaseType::STRUCT);
-    assert(stages);
+    assert(pushConstantStages_);
 
     for (ShaderVariableStructMember& member : pushConstantBlock_.type.struct_.members)
     {
@@ -158,7 +158,7 @@ void ShaderMeta::extendPushConstant(ShaderPushConstantBlock pushConstantBlock_,
         pushConstantBlock.type.struct_.members.insert(it, std::move(member));
     }
 
-    pushConstantStages |= stages;
+    pushConstantStages |= pushConstantStages_;
 }
 
 void ShaderMeta::addInputAttribute(ShaderAttribute attribute)