diff --git a/include/QF/model.h b/include/QF/model.h
index 335b83744..2d6203d25 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -406,6 +406,7 @@ typedef struct model_s
 
 	int			 numtextures;
 	texture_t	**textures;
+	texture_t	*skytexture;
 
 	byte		*visdata;
 	byte		*lightdata;
diff --git a/include/QF/sys.h b/include/QF/sys.h
index d40c116bf..15e543bc3 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -70,7 +70,7 @@ void Sys_RegisterShutdown (void (*func) (void));
 double Sys_DoubleTime (void);
 void Sys_TimeOfDay(date_t *date);
 
-int Sys_CheckInput (int idle, int net_socket);
+int Sys_CheckInput (int idle, unsigned int net_socket);
 const char *Sys_ConsoleInput (void);
 
 void Sys_Sleep (void);
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index d21cf280b..f26aca08d 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -177,7 +177,7 @@ Mod_LoadTextures (lump_t *l)
 		memcpy (tx + 1, mt + 1, pixels);
 
 		if (!strncmp (mt->name, "sky", 3))
-			R_InitSky (tx);
+			loadmodel->skytexture = tx;
 		else {
 			Mod_ProcessTexture (mt, tx);
 		}
diff --git a/libs/util/sys.c b/libs/util/sys.c
index cdb4bd283..cfde73755 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -504,7 +504,7 @@ Sys_DebugLog (const char *file, const char *fmt, ...)
 }
 
 int
-Sys_CheckInput (int idle, int net_socket)
+Sys_CheckInput (int idle, unsigned int net_socket)
 {
 	fd_set      fdset;
 	int         res;
diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index ed1dd209f..94d81f73b 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -193,8 +193,10 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 		tex = r_worldentity.model->textures[i];
 		if (!tex)
 			continue;
-		if (!strncmp (tex->name, "sky", 3))
+		if (!strncmp (tex->name, "sky", 3)) {
 			skytexturenum = i;
+			R_InitSky (tex);
+		}
 		if (!strncmp (tex->name, "window02_1", 10))
 			mirrortexturenum = i;
 		tex->texturechain = NULL;
diff --git a/libs/video/renderer/sw/sw_rmain.c b/libs/video/renderer/sw/sw_rmain.c
index 5d0872e3c..5d6d8a18c 100644
--- a/libs/video/renderer/sw/sw_rmain.c
+++ b/libs/video/renderer/sw/sw_rmain.c
@@ -198,6 +198,9 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 	for (i = 0; i < r_worldentity.model->numleafs; i++)
 		r_worldentity.model->leafs[i].efrags = NULL;
 
+	if (worldmodel->skytexture)
+		R_InitSky (worldmodel->skytexture);
+
 	r_viewleaf = NULL;
 	R_ClearParticles ();
 
diff --git a/libs/video/renderer/sw32/sw32_rmain.c b/libs/video/renderer/sw32/sw32_rmain.c
index 771e22ef3..be7d3f5e3 100644
--- a/libs/video/renderer/sw32/sw32_rmain.c
+++ b/libs/video/renderer/sw32/sw32_rmain.c
@@ -226,6 +226,9 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 	for (i = 0; i < r_worldentity.model->numleafs; i++)
 		r_worldentity.model->leafs[i].efrags = NULL;
 
+	if (worldmodel->skytexture)
+		R_InitSky (worldmodel->skytexture);
+
 	r_viewleaf = NULL;
 	R_ClearParticles ();
 
diff --git a/libs/video/targets/joy_win.c b/libs/video/targets/joy_win.c
index d5bf7df51..696d31ec7 100644
--- a/libs/video/targets/joy_win.c
+++ b/libs/video/targets/joy_win.c
@@ -166,7 +166,7 @@ _JOY_Read (void)
 void
 JOY_Read (void)
 {
-	int         i;
+	DWORD       i;
 	DWORD       buttonstate, povstate;
 
 	if (!joy_found) {
diff --git a/libs/video/targets/vid_wgl.c b/libs/video/targets/vid_wgl.c
index a67c54485..fb2a37808 100644
--- a/libs/video/targets/vid_wgl.c
+++ b/libs/video/targets/vid_wgl.c
@@ -119,7 +119,7 @@ QFGL_LoadLibrary (void)
 
 	if (!(handle = LoadLibrary (gl_driver->string)))
 		Sys_Error ("Couldn't load OpenGL library %s!", gl_driver->string);
-	(FARPROC) glGetProcAddress = GetProcAddress (handle, "wglGetProcAddress");
+	glGetProcAddress = (void *(WINAPI *)(const char*)) GetProcAddress (handle, "wglGetProcAddress");
 	return handle;
 }
 
@@ -452,7 +452,7 @@ void
 VID_Init (unsigned char *palette)
 {
 	BOOL		stat;
-	int			bpp, vid_mode;
+	WORD		bpp, vid_mode;
 	HDC			hdc;
 	HGLRC		baseRC;
 	DWORD		lasterror;