diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 855056cf1..31ecc92ca 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1926,8 +1926,10 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 	if (*oldtic != I_GetTime())
 	{
 		I_OsPolling();
+#if 0
 		for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
 			G_MapEventsToControls(&events[eventtail]);
+#endif
 
 		if (cl_mode == CL_CONFIRMCONNECT)
 			D_ProcessEvents(); //needed for menu system to receive inputs
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 2eaf3e7d5..fcfba62d9 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -282,7 +282,7 @@ boolean CL_CheckDownloadable(void)
 		}
 
 	// Downloading locally disabled
-#if 0
+#ifndef TESTERS
 	if (!dlstatus && M_CheckParm("-nodownload"))
 		dlstatus = 3;