diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index 30bac2e1..c24f45bf 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -1176,10 +1176,10 @@ void CG_DumpEmitter_f(void)
             buff +=
                 va("%s\tspawnrange %i %i\n",
                    sTabbing.c_str(),
-                   sqrt(pCurrSpawnthing->fMinRangeSquared),
-                   sqrt(pCurrSpawnthing->fMaxRangeSquared));
+                   (int)sqrt(pCurrSpawnthing->fMinRangeSquared),
+                   (int)sqrt(pCurrSpawnthing->fMaxRangeSquared));
         } else if (pCurrSpawnthing->fMaxRangeSquared > 0) {
-            buff += va("%s\tspawnrange %i\n", sTabbing.c_str(), sqrt(pCurrSpawnthing->fMaxRangeSquared));
+            buff += va("%s\tspawnrange %i\n", sTabbing.c_str(), (int)sqrt(pCurrSpawnthing->fMaxRangeSquared));
         }
 
         if (pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) {
@@ -1441,7 +1441,13 @@ void CG_DumpEmitter_f(void)
 }
 
 void CG_LoadBaseAndAmplitude(
-    char **pBufer, char *szCvarX, char *szCvarY, char *szCvarZ, char *szCvarXAmp, char *szCvarYAmp, char *szCvarZAmp
+    char      **pBufer,
+    const char *szCvarX,
+    const char *szCvarY,
+    const char *szCvarZ,
+    const char *szCvarXAmp,
+    const char *szCvarYAmp,
+    const char *szCvarZAmp
 )
 {
     char com_token[MAX_TOKEN_CHARS];
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 8860f721..4160ecd0 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3832,10 +3832,10 @@ CL_ServerStatusResponse
 ===================
 */
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
-	char	*s;
-	char	info[MAX_INFO_STRING];
-	int		i, l, score, ping;
-	int		len;
+	const char	*s;
+	char		info[MAX_INFO_STRING];
+	int			i, l, score, ping;
+	int			len;
 	serverStatus_t *serverStatus;
 
 	serverStatus = NULL;