diff --git a/premake5.lua b/premake5.lua
index 844f5fe..4a1ceac 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -6,7 +6,6 @@ project "bakara"
     targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
     objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
 
-    buildoptions { "-fPIC" }
     files 
     {
         "%{wks.location}/vendor/glm/glm/**.hpp",
@@ -39,10 +38,10 @@ project "bakara"
 
     links 
     {
+        "bakatools",
         "GLFW",
         "GLAD",
-        "ImGui",
-        "bakatools"
+        "ImGui"
     }
 
     filter "configurations:Debug"
@@ -64,8 +63,9 @@ project "bakara"
         }
         runtime "Release"
         optimize "on"
-
+        
     filter "system:windows"
+        buildoptions "/MT"
         staticruntime "on"
         defines 
         { 
@@ -79,7 +79,7 @@ project "bakara"
 
     filter "system:linux"
         staticruntime "on"
-
+        buildoptions { "-fPIC" }
         files
         {
             "%{wks.location}/vendor/glm/glm/**.cpp"
diff --git a/src/plaforms/glfw/glfw_window.cpp b/src/plaforms/glfw/glfw_window.cpp
index 888094c..d1b5856 100644
--- a/src/plaforms/glfw/glfw_window.cpp
+++ b/src/plaforms/glfw/glfw_window.cpp
@@ -35,7 +35,7 @@ namespace Bk {
             if (!p_glfw_initialized++) 
             {
                 int success = glfwInit();
-                BK_MSG_ASSERT(success, "Couldn't initialize glfw!")
+                BK_CORE_MSG_ASSERT(success, "Couldn't initialize glfw!")
                 glfwSetErrorCallback(glfw_error_callback);
             }
             p_window = glfwCreateWindow((int)p_data.width, (int)p_data.height, p_data.title.c_str(), nullptr, nullptr);