diff --git a/engine/client/renderer.c b/engine/client/renderer.c
index a54190f2..b2d54b08 100644
--- a/engine/client/renderer.c
+++ b/engine/client/renderer.c
@@ -1093,7 +1093,7 @@ rendererinfo_t *rendererinfo[] =
 #endif
 #ifdef VKQUAKE
 	&vkrendererinfo,
-	#ifdef _WIN32
+	#if defined(_WIN32) && defined(GLQUAKE)
 		&nvvkrendererinfo,
 	#endif
 #endif
diff --git a/engine/d3d/vid_d3d.c b/engine/d3d/vid_d3d.c
index 5fa5e311..89f3aaae 100644
--- a/engine/d3d/vid_d3d.c
+++ b/engine/d3d/vid_d3d.c
@@ -800,7 +800,7 @@ qboolean D3D9_VID_ApplyGammaRamps		(unsigned int gammarampsize, unsigned short *
 		IDirect3DDevice9_SetGammaRamp(pD3DDev9, 0, D3DSGR_NO_CALIBRATION, (D3DGAMMARAMP *)ramps);
 	return true;
 }
-static char	*(D3D9_VID_GetRGBInfo)			(int *truevidwidth, int *truevidheight, enum uploadfmt *fmt)
+static char	*(D3D9_VID_GetRGBInfo)			(int *bytestride, int *truevidwidth, int *truevidheight, enum uploadfmt *fmt)
 {
 	IDirect3DSurface9 *backbuf, *surf;
 	D3DLOCKED_RECT rect;
@@ -845,7 +845,7 @@ static char	*(D3D9_VID_GetRGBInfo)			(int *truevidwidth, int *truevidheight, enu
 						}
 						p += rect.Pitch;
 					}
-
+					*bytestride = desc.Width*3;
 					*truevidwidth = desc.Width;
 					*truevidheight = desc.Height;
 				}
diff --git a/engine/d3d/vid_d3d11.c b/engine/d3d/vid_d3d11.c
index 7b5080be..3ef4068b 100644
--- a/engine/d3d/vid_d3d11.c
+++ b/engine/d3d/vid_d3d11.c
@@ -1108,7 +1108,7 @@ static qboolean	D3D11_VID_ApplyGammaRamps(unsigned int gammarampsize, unsigned s
 	}
 	return false;
 }
-static char	*D3D11_VID_GetRGBInfo(int *truevidwidth, int *truevidheight, enum uploadfmt *fmt)
+static char	*D3D11_VID_GetRGBInfo(int *bytestride, int *truevidwidth, int *truevidheight, enum uploadfmt *fmt)
 {
 	//don't directly map the frontbuffer, as that can hold other things.
 	//create a texture, copy the (gpu)backbuffer to that (cpu)texture
@@ -1153,6 +1153,7 @@ static char	*D3D11_VID_GetRGBInfo(int *truevidwidth, int *truevidheight, enum up
 		ID3D11DeviceContext_Unmap(d3ddevctx, (ID3D11Resource*)texture, 0);
 	}
 	ID3D11Texture2D_Release(texture);
+	*bytestride = vid.pixelwidth*3;
 	*truevidwidth = vid.pixelwidth;
 	*truevidheight = vid.pixelheight;
 	*fmt = TF_RGB24;
diff --git a/engine/gl/gl_vidnt.c b/engine/gl/gl_vidnt.c
index 87f611bb..43cd66f4 100644
--- a/engine/gl/gl_vidnt.c
+++ b/engine/gl/gl_vidnt.c
@@ -1704,7 +1704,9 @@ static void VID_UpdateWindowStatus (HWND hWnd)
 	switch(platform_rendermode)
 	{
 #ifdef VKQUAKE
+#ifdef USE_WGL
 	case MODE_NVVULKAN:
+#endif
 	case MODE_VULKAN:
 		if (vid.pixelwidth != window_width || vid.pixelheight != window_height)
 			vk.neednewswapchain = true;
@@ -3227,7 +3229,7 @@ rendererinfo_t vkrendererinfo =
 
 
 
-
+#ifdef USE_WGL
 static qboolean NVVKVID_Init (rendererstate_t *info, unsigned char *palette)
 {
 	return Win32VID_Init(info, palette, MODE_NVVULKAN);
@@ -3288,5 +3290,6 @@ rendererinfo_t nvvkrendererinfo =
 	"no more"
 };
 #endif
+#endif
 
 #endif