diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 330dfa27c2daf2dba1e748990d2a78bcea9461a0..9a636dd45555b901ef415ba56f4b74928fc3653c 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2566,7 +2566,6 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
 		*asksent = I_GetTime();
 	}
 #else
-	(void)viams;
 	(void)asksent;
 	// No netgames, so we skip this state.
 	cl_mode = CL_ASKJOIN;
diff --git a/src/doomdef.h b/src/doomdef.h
index a51b6630059268875ba4a2b2354f8956d7ecf030..6645fb834489b68c43b29de6d1d59f36b55fbfbe 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -644,7 +644,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 /// Maintain compatibility with older 2.2 demos
 #define OLD22DEMOCOMPAT
 
-#ifdef HAVE_CURL
+#if defined (HAVE_CURL) && ! defined (NONET)
 #define MASTERSERVER
 #else
 #undef UPDATE_ALERT