diff --git a/engine/client/cd_null.c b/engine/client/cd_null.c
index 0c48915ed..9486a171d 100644
--- a/engine/client/cd_null.c
+++ b/engine/client/cd_null.c
@@ -1,7 +1,6 @@
 #include "quakedef.h"
 
 #ifdef HAVE_CDPLAYER
-	//nothing
 
 #ifdef _WIN32
 //not really needed, but nice none-the-less.
diff --git a/engine/client/vid_headless.c b/engine/client/vid_headless.c
index 33b72e91f..b9d275819 100644
--- a/engine/client/vid_headless.c
+++ b/engine/client/vid_headless.c
@@ -38,7 +38,7 @@ static void	Headless_R_DeInit					(void)
 static void	Headless_R_RenderView				(void)
 {
 }
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FTE_SDL)
 //tray icon crap, so the user can still restore the game.
 LRESULT CALLBACK HeadlessWndProc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
diff --git a/engine/web/fs_web.c b/engine/web/fs_web.c
index f16ce1250..eeb62f8e9 100644
--- a/engine/web/fs_web.c
+++ b/engine/web/fs_web.c
@@ -155,7 +155,7 @@ vfsfile_t *VFSOS_Open(const char *osname, const char *mode)
 	qboolean needsflush;
 	f = VFSWEB_Open(osname, mode, &needsflush);
 	if (needsflush)
-		FS_FlushFSHash();
+		FS_FlushFSHashFull();
 	return f;
 }
 
@@ -233,7 +233,7 @@ static qboolean QDECL FSWEB_FLocate(searchpathfuncs_t *handle, flocation_t *loc,
 	{
 		loc->len = len;
 		loc->offset = 0;
-		loc->index = 0;
+		loc->fhandle = NULL;
 		Q_strncpyz(loc->rawname, netpath, sizeof(loc->rawname));
 	}
 	return true;