diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp
index d94caf23..74547a03 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp
@@ -53,7 +53,7 @@ public:
 private:
 	bool HasMonitorChanged()
 	{
-		HWND hWnd = (HWND)WindowSystem::getWindowInfo().canvas_main.surface;
+		HWND hWnd = (HWND)WindowSystem::GetWindowInfo().canvas_main.surface;
 		if (hWnd == 0)
 			return true;
 		HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
@@ -71,7 +71,7 @@ private:
 
 	HRESULT GetAdapterHandleFromHwnd(D3DKMT_HANDLE* phAdapter, UINT* pOutput)
 	{
-		HWND hWnd = (HWND)WindowSystem::getWindowInfo().canvas_main.surface;
+		HWND hWnd = (HWND)WindowSystem::GetWindowInfo().canvas_main.surface;
 		if (hWnd == 0)
 			return E_FAIL;
 
diff --git a/src/audio/DirectSoundAPI.cpp b/src/audio/DirectSoundAPI.cpp
index b326c9b6..d14531eb 100644
--- a/src/audio/DirectSoundAPI.cpp
+++ b/src/audio/DirectSoundAPI.cpp
@@ -17,7 +17,7 @@ DirectSoundAPI::DirectSoundAPI(GUID* guid, sint32 samplerate, sint32 channels, s
 	if (DirectSoundCreate8(guid, &m_direct_sound, nullptr) != DS_OK)
 		throw std::runtime_error("can't create directsound device");
 
-	if (FAILED(m_direct_sound->SetCooperativeLevel(static_cast<HWND>(WindowSystem::getWindowInfo().window_main.surface), DSSCL_PRIORITY)))
+	if (FAILED(m_direct_sound->SetCooperativeLevel(static_cast<HWND>(WindowSystem::GetWindowInfo().window_main.surface), DSSCL_PRIORITY)))
 		throw std::runtime_error("can't set directsound priority");
 
 	DSBUFFERDESC bd{};
diff --git a/src/config/XMLConfig.h b/src/config/XMLConfig.h
index eb730ef5..2e46b8db 100644
--- a/src/config/XMLConfig.h
+++ b/src/config/XMLConfig.h
@@ -586,7 +586,7 @@ class XMLDataConfig<T> : public XMLConfig<XMLConfigWrapper<T>>
 		: XMLConfig<XMLConfigWrapper<T>>::XMLConfig(m_configWrapper, filename), m_configWrapper() {}
 
 	XMLDataConfig(std::wstring_view filename, T init_data)
-		: XMLConfig<XMLConfigWrapper<T>>::XMLConfig(m_configWrapper, filename), m_configWrapper(std::move(init_data)) {}
+		: XMLConfig<XMLConfigWrapper<T>>::XMLConfig(m_configWrapper, filename), m_configWrapper{.data = std::move(init_data)} {}
 
 	XMLDataConfig(const XMLDataConfig& o) = delete;
 
diff --git a/src/input/api/DirectInput/DirectInputController.cpp b/src/input/api/DirectInput/DirectInputController.cpp
index 38b1450c..0792aac7 100644
--- a/src/input/api/DirectInput/DirectInputController.cpp
+++ b/src/input/api/DirectInput/DirectInputController.cpp
@@ -104,7 +104,7 @@ bool DirectInputController::connect()
 		return false;
 	}
 
-	HWND hwndMainWindow = static_cast<HWND>(WindowSystem::getWindowInfo().window_main.surface);
+	HWND hwndMainWindow = static_cast<HWND>(WindowSystem::GetWindowInfo().window_main.surface);
 
 	// set access
 	if (FAILED(m_device->SetCooperativeLevel(hwndMainWindow, DISCL_BACKGROUND | DISCL_EXCLUSIVE)))
diff --git a/src/main.cpp b/src/main.cpp
index 23eee26a..0336fd64 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -227,7 +227,7 @@ int wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LP
 	SDL_SetMainReady();
 	if (!LaunchSettings::HandleCommandline(lpCmdLine))
 		return 0;
-	WindowSystem::create();
+	WindowSystem::Create();
 	return 0;
 }
 
@@ -239,7 +239,7 @@ int main(int argc, char* argv[])
 	SDL_SetMainReady();
 	if (!LaunchSettings::HandleCommandline(argc, argv))
 		return 0;
-	WindowSystem::create();
+	WindowSystem::Create();
 	return 0;
 }