diff --git a/server/Windows/wf_settings.c b/server/Windows/wf_settings.c
index 5e4c2d1c4..5167e4f19 100644
--- a/server/Windows/wf_settings.c
+++ b/server/Windows/wf_settings.c
@@ -61,7 +61,7 @@ BOOL wf_settings_read_string_ascii(HKEY key, LPTSTR subkey, LPTSTR name, char**
 	DWORD dwType;
 	DWORD dwSize;
 	char* strA;
-	TCHAR* strX;
+	TCHAR* strX = NULL;
 
 	status = RegOpenKeyEx(key, subkey, 0, KEY_READ | KEY_WOW64_64KEY, &hKey);
 
diff --git a/server/Windows/wf_update.c b/server/Windows/wf_update.c
index a049e4a03..5964925a7 100644
--- a/server/Windows/wf_update.c
+++ b/server/Windows/wf_update.c
@@ -208,7 +208,9 @@ void wf_update_peer_activate(wfInfo* wfi, wfPeerContext* context)
 	{
 		if (wfi->activePeerCount < 1)
 		{
-			//wf_mirror_driver_activate(wfi);
+#ifndef WITH_WIN8
+			wf_mirror_driver_activate(wfi);
+#endif
 			ResumeThread(wfi->updateThread);
 		}