diff --git a/src_rebuild/EMULATOR/EMULATOR.C b/src_rebuild/EMULATOR/EMULATOR.C
index 056df354..70d1d35b 100644
--- a/src_rebuild/EMULATOR/EMULATOR.C
+++ b/src_rebuild/EMULATOR/EMULATOR.C
@@ -2612,6 +2612,8 @@ unsigned int Emulator_GetFPS()
 
 void Emulator_SwapWindow()
 {
+	Emulator_WaitForTimestep(1);
+
 #if defined(RO_DOUBLE_BUFFERED)
 #if defined(OGL)
 	SDL_GL_SwapWindow(g_window);
diff --git a/src_rebuild/EMULATOR/LIBETC.C b/src_rebuild/EMULATOR/LIBETC.C
index f22ed31f..501c20e0 100644
--- a/src_rebuild/EMULATOR/LIBETC.C
+++ b/src_rebuild/EMULATOR/LIBETC.C
@@ -30,8 +30,6 @@ int VSync(int mode)
 	if (mode < 0)
 		return SDL_GetTicks() - g_swapTime;
 
-	Emulator_WaitForTimestep(1);
-
 	if (mode == 0)
 	{
 		if (vsync_callback != NULL)
@@ -39,10 +37,9 @@ int VSync(int mode)
 	}
 	else if (mode > 0)
 	{
-		Emulator_WaitForTimestep(mode);
 	}
 
-	return g_swapTime;
+	return SDL_GetTicks();
 }
 
 int VSyncCallback(void(*f)(void))
diff --git a/src_rebuild/GAME/C/SPOOL.C b/src_rebuild/GAME/C/SPOOL.C
index 618131a2..5c75d7cf 100644
--- a/src_rebuild/GAME/C/SPOOL.C
+++ b/src_rebuild/GAME/C/SPOOL.C
@@ -66,7 +66,7 @@ int spool_regioncounter;
 int spoolerror;	// UNUSED
 int spool_regionpos;
 volatile int spoolactive;	// volatile is required at least for PC
-int quickSpool;
+volatile int quickSpool;
 int models_ready;
 
 short specspooldata[3] = { 20, 10 };