diff --git a/engine/client/r_surf.c b/engine/client/r_surf.c
index aa6e2bba7..a5faa8dfd 100644
--- a/engine/client/r_surf.c
+++ b/engine/client/r_surf.c
@@ -3298,7 +3298,7 @@ void Surf_DrawWorld (void)
 #ifdef THREADEDWORLD
 		if ((r_dynamic.ival < 0 || currentmodel->numbatches) && !r_refdef.recurse && currentmodel->type == mod_brush)
 		{
-			struct webostate_s *webostate, *best = NULL, *generating = NULL;
+			struct webostate_s *webostate, *best = NULL;
 			vec_t bestdist = FLT_MAX;
 			for (webostate = webostates; webostate; webostate = webostate->next)
 			{
@@ -3322,6 +3322,7 @@ void Surf_DrawWorld (void)
 					}
 				}
 			}
+			webostate = best;
 
 			if (qrenderer != QR_OPENGL && qrenderer != QR_VULKAN)
 				;
diff --git a/engine/common/pr_bgcmd.c b/engine/common/pr_bgcmd.c
index 67a16e938..6427f922b 100644
--- a/engine/common/pr_bgcmd.c
+++ b/engine/common/pr_bgcmd.c
@@ -3942,17 +3942,17 @@ size_t			strbufmax;
 
 static void PR_buf_savegame(vfsfile_t *f, pubprogfuncs_t *prinst, qboolean binary)
 {
-	size_t i, bufno;
+	unsigned int i, bufno;
 
 	for (bufno = 0; bufno < strbufmax; bufno++)
 	{
 		if (strbuflist[bufno].prinst == prinst && (strbuflist[bufno].flags & BUFFLAG_SAVED))
 		{
-			VFS_PRINTF (f, "buffer %i %i %i %i\n", bufno, 1, ev_string, strbuflist[bufno].used);
+			VFS_PRINTF (f, "buffer %u %i %i %u\n", bufno, 1, ev_string, (unsigned int)strbuflist[bufno].used);
 			VFS_PRINTF (f, "{\n");
 			for (i = 0; i < strbuflist[bufno].used; i++)
 				if (strbuflist[bufno].strings[i])
-					VFS_PRINTF (f, "%i %s\n", i, strbuflist[bufno].strings[i]);		
+					VFS_PRINTF (f, "%u %s\n", i, strbuflist[bufno].strings[i]);
 			VFS_PRINTF (f, "}\n");
 		}
 	}