diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index 5623d453..1a0ff53a 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -925,6 +925,7 @@ void CLFTE_ParseEntities(void)
 	cl.inframes[newpacket].receivedtime = realtime;
 	cl.inframes[newpacket].frameid = cls.netchan.incoming_sequence;
 
+#ifdef QUAKESTATS
 	for (i = 0; i < cl.splitclients; i++)
 	{
 		cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchangle[i][0] = cl.playerview[i].statsf[STAT_PUNCHANGLE_X];
@@ -934,6 +935,7 @@ void CLFTE_ParseEntities(void)
 		cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchorigin[i][1] = cl.playerview[i].statsf[STAT_PUNCHVECTOR_Y];
 		cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchorigin[i][2] = cl.playerview[i].statsf[STAT_PUNCHVECTOR_Z];
 	}
+#endif
 
 
 	if (!cl.validsequence || cls.netchan.incoming_sequence-cl.validsequence >= UPDATE_BACKUP-1 || oldp == newp)
diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c
index a5fea9ec..3de93747 100644
--- a/engine/client/cl_parse.c
+++ b/engine/client/cl_parse.c
@@ -7772,6 +7772,7 @@ void CLNQ_ParseServerMessage (void)
 				cl.inframes[cl.validsequence&UPDATE_MASK].packet_entities.num_entities=0;
 				cl.inframes[cl.validsequence&UPDATE_MASK].packet_entities.servertime = cl.gametime;
 			}
+#ifdef QUAKESTATS
 			for (i = 0; i < cl.splitclients; i++)
 			{
 				cl.inframes[cl.validsequence&UPDATE_MASK].packet_entities.punchangle[i][0] = cl.playerview[i].statsf[STAT_PUNCHANGLE_X];
@@ -7781,6 +7782,7 @@ void CLNQ_ParseServerMessage (void)
 				cl.inframes[cl.validsequence&UPDATE_MASK].packet_entities.punchorigin[i][1] = cl.playerview[i].statsf[STAT_PUNCHVECTOR_Y];
 				cl.inframes[cl.validsequence&UPDATE_MASK].packet_entities.punchorigin[i][2] = cl.playerview[i].statsf[STAT_PUNCHVECTOR_Z];
 			}
+#endif
 			break;
 
 		case svc_updatename:
diff --git a/engine/client/vid_headless.c b/engine/client/vid_headless.c
index b9d27581..a85f77e2 100644
--- a/engine/client/vid_headless.c
+++ b/engine/client/vid_headless.c
@@ -71,7 +71,7 @@ LRESULT CALLBACK HeadlessWndProc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lpara
 
 static qboolean Headless_VID_Init				(rendererstate_t *info, unsigned char *palette)
 {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FTE_SDL)
 	//tray icon crap, so the user can still restore the game.
 	extern HWND	mainwindow;
 	extern HINSTANCE	global_hInstance;
@@ -140,7 +140,7 @@ static qboolean Headless_VID_Init				(rendererstate_t *info, unsigned char *pale
 }
 static void	 Headless_VID_DeInit				(void)
 {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FTE_SDL)
 	//tray icon crap, so the user can still restore the game.
 	//FIXME: remove tray icon. win95 won't do this automagically.
 	extern HWND	mainwindow;
@@ -168,7 +168,7 @@ static qboolean	Headless_SCR_UpdateScreen			(void)
 {
 	if (!cls.timedemo)
 	{
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FTE_SDL)
 		Sleep(100);
 #else
 		usleep(100*1000);
diff --git a/engine/nacl/fs_ppapi.c b/engine/nacl/fs_ppapi.c
index af9c0dfb..ea260518 100644
--- a/engine/nacl/fs_ppapi.c
+++ b/engine/nacl/fs_ppapi.c
@@ -239,7 +239,7 @@ static void FSPPAPI_DoUnlink(mfile_t *file)
 	//and finally free the last bit of memory.
 	free(file);
 }
-static void VFSMEM_Close(vfsfile_t *file)
+static qboolean VFSMEM_Close(vfsfile_t *file)
 {
 	vfsmfile_t *f = (vfsmfile_t*)file;
 	f->file->refs -= 1;
@@ -247,6 +247,7 @@ static void VFSMEM_Close(vfsfile_t *file)
 		if (f->file->unlinked)
 			FSPPAPI_DoUnlink(f->file);
 	free(f);
+	return true;
 }
 static void VFSMEM_Flush(struct vfsfile_s *file)
 {
@@ -418,13 +419,13 @@ int Sys_EnumerateFiles (const char *rootpath, const char *match, int (*func)(con
 	}
 	return true;
 }
-static int FSPPAPI_EnumerateFiles (searchpathfuncs_t *handle, const char *match, int (*func)(const char *, qofs_t, void *, searchpathfuncs_t *), void *parm)
+static int FSPPAPI_EnumerateFiles (searchpathfuncs_t *handle, const char *match, int (*func)(const char *, qofs_t, time_t, void *, searchpathfuncs_t *), void *parm)
 {
 	pppath_t *sp = (void*)handle;
 	return Sys_EnumerateFiles(sp->rootpath, match, func, parm, handle);
 }
 
-static int FSPPAPI_RebuildFSHash(const char *filename, qofs_t filesize, void *data, searchpathfuncs_t *handle)
+static int FSPPAPI_RebuildFSHash(const char *filename, qofs_t filesize, time_t time, void *data, searchpathfuncs_t *handle)
 {
 	pppath_t *sp = (void*)handle;
 	void (QDECL *AddFileHash)(int depth, const char *fname, fsbucket_t *filehandle, void *pathhandle) = data;
@@ -477,7 +478,7 @@ static qboolean FSPPAPI_FLocate(searchpathfuncs_t *handle, flocation_t *loc, con
 	{
 		loc->len = len;
 		loc->offset = 0;
-		loc->index = 0;
+		loc->fhandle = 0;
 		Q_strncpyz(loc->rawname, filename, sizeof(loc->rawname));
 	}
 
@@ -495,7 +496,7 @@ static void FSPPAPI_ReadFile(searchpathfuncs_t *handle, flocation_t *loc, char *
 	result = VFS_READ(f, buffer, loc->len);
 
 	if (result != loc->len)
-		Con_Printf("FSPPAPI_ReadFile() fread: Filename: %s, expected %i, result was %u\n",loc->rawname,loc->len,(unsigned int)result);
+		Con_Printf("FSPPAPI_ReadFile() fread: Filename: %s, expected %i, result was %u\n",loc->rawname,(int)loc->len,(unsigned int)result);
 
 	VFS_CLOSE(f);
 }
diff --git a/engine/nacl/snd_ppapi.c b/engine/nacl/snd_ppapi.c
index 1166ea7f..9fca7e7d 100644
--- a/engine/nacl/snd_ppapi.c
+++ b/engine/nacl/snd_ppapi.c
@@ -8,11 +8,13 @@ extern PPB_Audio *audio_interface;
 extern PPB_AudioConfig *audioconfig_interface;
 extern PP_Instance pp_instance;
 
-static PPB_Audio_Callback audio_callback;
-
 extern int S_GetMixerTime(soundcardinfo_t *sc);
 
-static void PPAPI_audio_callback(void *sample_buffer, uint32_t len, void *user_data)
+static void PPAPI_audio_callback(void *sample_buffer, uint32_t len, 
+#ifdef PPB_AUDIO_INTERFACE_1_1
+								 PP_TimeDelta latency,
+#endif
+								 void *user_data)
 {
 	soundcardinfo_t *sc = user_data;
 	unsigned int framesz;
@@ -54,10 +56,6 @@ static void *PPAPI_LockBuffer(soundcardinfo_t *sc, unsigned int *sampidx)
     return sc->sn.buffer;
 }
 
-static void PPAPI_SetUnderWater(soundcardinfo_t *sc, qboolean uw)
-{
-}
-
 static void PPAPI_Submit(soundcardinfo_t *sc, int start, int end)
 {
 }
diff --git a/engine/nacl/sys_ppapi.c b/engine/nacl/sys_ppapi.c
index c507afc8..36f236a7 100644
--- a/engine/nacl/sys_ppapi.c
+++ b/engine/nacl/sys_ppapi.c
@@ -318,7 +318,7 @@ void FrameEvent(void* user_data, int32_t result)
 }
 void startquake(char *manif)
 {
-	static char *args[16];
+	static const char *args[16];
 	quakeparms_t parms;
 	memset(&parms, 0, sizeof(parms));
 	parms.basedir = "";	/*filled in later*/
@@ -645,7 +645,7 @@ PP_EXPORT int32_t PPP_InitializeModule(PP_Module a_module_id, PPB_GetInterface g
 	ppb_fullscreen_interface = (PPB_Fullscreen*)(get_browser(PPB_FULLSCREEN_INTERFACE));
 	ppb_websocket_interface = (PPB_WebSocket*)(get_browser(PPB_WEBSOCKET_INTERFACE));
 	ppb_view_instance = (PPB_View*)(get_browser(PPB_VIEW_INTERFACE));
-	ppb_vararraybuffer_interface = (PPB_View*)(get_browser(PPB_VAR_ARRAY_BUFFER_INTERFACE));
+	ppb_vararraybuffer_interface = (PPB_VarArrayBuffer*)(get_browser(PPB_VAR_ARRAY_BUFFER_INTERFACE));
 
 	glInitializePPAPI(sys_gbi);
 
diff --git a/engine/server/sv_send.c b/engine/server/sv_send.c
index e2759829..807dea32 100644
--- a/engine/server/sv_send.c
+++ b/engine/server/sv_send.c
@@ -2125,6 +2125,10 @@ void SV_CalcClientStats(client_t *client, int statsi[MAX_CL_STATS], float statsf
 		statsf[STAT_PUNCHANGLE_Y] = ent->xv->punchangle[1];
 		statsf[STAT_PUNCHANGLE_Z] = ent->xv->punchangle[2];
 
+//		statsf[STAT_PUNCHORIGIN_X] = ent->xv->punchvector[0];
+//		statsf[STAT_PUNCHORIGIN_Y] = ent->xv->punchvector[1];
+//		statsf[STAT_PUNCHORIGIN_Z] = ent->xv->punchvector[2];
+
 	#ifdef PEXT_VIEW2
 		if (ent->xv->view2)
 			statsi[STAT_VIEW2] = NUM_FOR_EDICT(svprogfuncs, PROG_TO_EDICT(svprogfuncs, ent->xv->view2));