diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
index 49f20004..a77044ee 100644
--- a/.github/workflows/macOS.yml
+++ b/.github/workflows/macOS.yml
@@ -43,7 +43,7 @@ jobs:
 
       - name: Generate a new project
         shell: bash
-        run: cd Project && sh GenerateSolution.command && cd ../
+        run: cd Project && sh GenerateSolution.command && cd ../ && ls
 
       - name: Build Editor
         if: ${{ matrix.type == 'Editor' }}
@@ -54,6 +54,7 @@ jobs:
           action: build # default = `test`
           code-coverage: true # default = `false`
           warnings-as-errors: false # default = `false`
+          workspace: EmptyProject.xcworkspace
           configuration: ${{ matrix.type }}_${{ matrix.configuration }} # no default, ie. `xcodebuild` decides itself
           scheme: Havana_mac
 
@@ -66,6 +67,7 @@ jobs:
           action: build # default = `test`
           code-coverage: true # default = `false`
           warnings-as-errors: false # default = `false`
+          workspace: EmptyProject.xcworkspace
           configuration: ${{ matrix.type }}_${{ matrix.configuration }} # no default, ie. `xcodebuild` decides itself
           scheme: Game_EntryPoint_mac
 
diff --git a/Modules/Dementia/Source/Math/Frustrum.h b/Modules/Dementia/Source/Math/Frustrum.h
index fa35bc6c..e47a6135 100644
--- a/Modules/Dementia/Source/Math/Frustrum.h
+++ b/Modules/Dementia/Source/Math/Frustrum.h
@@ -4,7 +4,7 @@
 #include "Vector2.h"
 
 #include "Matrix4.h"
-#include "glm\detail\type_vec.hpp"
+#include <glm/glm.hpp>
 
 class Frustum
 {
diff --git a/Modules/Moonlight/Source/Graphics/ShaderFile.h b/Modules/Moonlight/Source/Graphics/ShaderFile.h
index 17e0adc4..75494373 100644
--- a/Modules/Moonlight/Source/Graphics/ShaderFile.h
+++ b/Modules/Moonlight/Source/Graphics/ShaderFile.h
@@ -113,9 +113,9 @@ struct ShaderFileMetadata
             exportType = "vertex";
         }
 
-        std::string fileName = FilePath.GetLocalPath().substr( FilePath.GetLocalPath().rfind( "/" ) + 1, FilePath.GetLocalPath().length() );
-
-        std::string localFolder = FilePath.GetLocalPath().substr( 0, FilePath.GetLocalPath().rfind( "/" ) + 1 );
+        // #TODO: Do I need this local string shit?
+        std::string fileName = FilePath.GetLocalPathString().substr( FilePath.GetLocalPathString().rfind( "/" ) + 1, FilePath.GetLocalPathString().length() );
+        std::string localFolder = FilePath.GetLocalPathString().substr( 0, FilePath.GetLocalPathString().rfind( "/" ) + 1 );
 
         std::string nameNoExt = fileName.substr( 0, fileName.rfind( "." ) );
         std::string progArgs = "\"" + shadercPath.FullPath + "\" -f ../../";
diff --git a/Modules/Moonlight/Source/Graphics/Texture.cpp b/Modules/Moonlight/Source/Graphics/Texture.cpp
index dac91c49..348c77e8 100644
--- a/Modules/Moonlight/Source/Graphics/Texture.cpp
+++ b/Modules/Moonlight/Source/Graphics/Texture.cpp
@@ -295,8 +295,8 @@ void TextureResourceMetadata::Export()
 
     // texturec -f $in -o $out -t bc2 -m
     std::string progArgs = "\"" + optickPath.FullPath + "\" -f ../../";
-    progArgs += FilePath.LocalPath;
-    progArgs += " -o \"../../" + FilePath.LocalPath + ".dds\"" + exportType;
+    progArgs += FilePath.GetLocalPathString();
+    progArgs += " -o \"../../" + FilePath.GetLocalPathString() + ".dds\"" + exportType;
     system( progArgs.c_str() );
 
 #endif
diff --git a/Source/Cores/Rendering/RenderCore.cpp b/Source/Cores/Rendering/RenderCore.cpp
index 12bd48a2..0c13b7a9 100644
--- a/Source/Cores/Rendering/RenderCore.cpp
+++ b/Source/Cores/Rendering/RenderCore.cpp
@@ -113,7 +113,8 @@ void RenderCore::Update( const UpdateContext& inUpdateContext )
 
                     for( Moonlight::CameraData& cam : cameras.Commands )
                     {
-                        if( cam.ViewFrustum.IsPointInFrustum( glm::vec4(meshMatrix[3] ) ) )
+                        glm::vec4 point = glm::vec4( meshMatrix[3] );
+                        if( cam.ViewFrustum.IsPointInFrustum( point ) )
                         {
                             isVisible = true;
                             cam.VisibleFlags[entIndex] = true;
diff --git a/Source/Engine/Engine.cpp b/Source/Engine/Engine.cpp
index b31942dd..fac01aa7 100644
--- a/Source/Engine/Engine.cpp
+++ b/Source/Engine/Engine.cpp
@@ -180,8 +180,9 @@ void Engine::Init( Game* game )
 
     // Register systems
     {
-        updateContext.m_SystemRegistry->RegisterSystem( NewRenderer );
+        systemRegistry.RegisterSystem( NewRenderer );
     }
+    updateContext.m_SystemRegistry = &systemRegistry;
 
     m_isInitialized = true;
 }
diff --git a/Source/Engine/Engine.h b/Source/Engine/Engine.h
index 4af8da0b..dca64175 100644
--- a/Source/Engine/Engine.h
+++ b/Source/Engine/Engine.h
@@ -93,6 +93,7 @@ class Engine
     JobEngine newJobSystem;
 
     EngineUpdateContext updateContext;
+    SystemRegistry systemRegistry;
 
 #if USING( ME_EDITOR )
     Input m_editorInput;
diff --git a/Source/UI/Graphics/GPUDriver.cpp b/Source/UI/Graphics/GPUDriver.cpp
index 5c4e5430..b61a5d4f 100644
--- a/Source/UI/Graphics/GPUDriver.cpp
+++ b/Source/UI/Graphics/GPUDriver.cpp
@@ -1,12 +1,11 @@
 #include "PCH.h"
 #include "GPUDriver.h"
-#include "Utils\BGFXUtils.h"
-#include "bimg\decode.h"
-#include "Core\Assert.h"
-#include "Device\FrameBuffer.h"
-#include "bgfx\bgfx.h"
-#include "Graphics\ShaderStructures.h"
-#include <DirectXMath.h>
+#include <Utils/BGFXUtils.h>
+#include <bimg/decode.h>
+#include "Core/Assert.h"
+#include "Device/FrameBuffer.h"
+#include "bgfx/bgfx.h"
+#include "Graphics/ShaderStructures.h"
 #include <glm/glm.hpp>
 
 #if USING( ME_UI )
diff --git a/Source/UI/UIUtils.cpp b/Source/UI/UIUtils.cpp
index a0247c67..5334c976 100644
--- a/Source/UI/UIUtils.cpp
+++ b/Source/UI/UIUtils.cpp
@@ -3,7 +3,7 @@
 
 #if USING( ME_ULTRALIGHT )
 
-#include "Ultralight\KeyCodes.h"
+#include <Ultralight/KeyCodes.h>
 
 bool UIUtils::ConvertToULChar( KeyCode inKeyCode, int& outULKeyCode )
 {
diff --git a/Source/UI/UIUtils.h b/Source/UI/UIUtils.h
index 2c9e1851..bda786ba 100644
--- a/Source/UI/UIUtils.h
+++ b/Source/UI/UIUtils.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Engine\Input.h"
+#include <Engine/Input.h>
 
 namespace UIUtils
 {
diff --git a/Source/UI/UIWindow.h b/Source/UI/UIWindow.h
index a0970d8b..f822c389 100644
--- a/Source/UI/UIWindow.h
+++ b/Source/UI/UIWindow.h
@@ -12,9 +12,8 @@ class UIWindow
     : public ultralight::Window
     , public ultralight::RefCountedImpl<UIWindow>
 {
-    friend class ultralight::OverlayImpl;
     friend class ultralight::Window;
-    friend class ultralight::OverlayImpl;
+    //friend class ultralight::OverlayImpl;
 public:
     UIWindow( IWindow* window, ultralight::OverlayManager* manager );
 protected:
diff --git a/Tools/BaseProject.sharpmake.cs b/Tools/BaseProject.sharpmake.cs
index 540c0e16..a0296a3a 100644
--- a/Tools/BaseProject.sharpmake.cs
+++ b/Tools/BaseProject.sharpmake.cs
@@ -201,9 +201,18 @@ public virtual void ConfigureRelease(Configuration conf, CommonTarget target)
     {
         conf.DefaultOption = Options.DefaultTarget.Release;
         conf.Options.Add(Sharpmake.Options.Vc.Compiler.RuntimeLibrary.MultiThreadedDLL);
+        conf.Options.Add(Options.Vc.General.DebugInformation.ProgramDatabase);
         conf.Options.Add(Options.Vc.Compiler.Inline.OnlyInline);
-        conf.AdditionalCompilerOptions.Add("/Zi");
         conf.Defines.Add("DEFINE_ME_RELEASE");
+
+        if (conf.Platform == Platform.win64 )
+        {
+            conf.AdditionalCompilerOptions.Add("/Zi");
+        }
+        else if (conf.Platform == Platform.mac)
+        {
+            conf.AdditionalCompilerOptions.Add("-g");
+        }
     }