diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 23ea0e755..8b6ecb64b 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -590,7 +590,7 @@ void GLReplay::GetMapping(WrappedOpenGL &gl, GLuint curProg, int shadIdx, Shader
 	GLint dummyReadback[32];
 
 #if !defined(RELEASE)
-	for(int i=1; i < ARRAY_COUNT(dummyReadback); i++)
+	for(size_t i=1; i < ARRAY_COUNT(dummyReadback); i++)
 		dummyReadback[i] = 0x6c7b8a9d;
 #endif
 
@@ -671,7 +671,7 @@ void GLReplay::GetMapping(WrappedOpenGL &gl, GLuint curProg, int shadIdx, Shader
 	}
 
 #if !defined(RELEASE)
-	for(int i=1; i < ARRAY_COUNT(dummyReadback); i++)
+	for(size_t i=1; i < ARRAY_COUNT(dummyReadback); i++)
 		if(dummyReadback[i] != 0x6c7b8a9d)
 			RDCERR("Invalid uniform readback - data beyond first element modified!");
 #endif
diff --git a/renderdoc/driver/gl/gl_replay_linux.cpp b/renderdoc/driver/gl/gl_replay_linux.cpp
index c61614149..3110fb585 100644
--- a/renderdoc/driver/gl/gl_replay_linux.cpp
+++ b/renderdoc/driver/gl/gl_replay_linux.cpp
@@ -51,7 +51,7 @@ void GLReplay::MakeCurrentReplayContext(GLWindowingData *ctx)
 	{
 		prev = ctx;
 		glXMakeContextCurrentProc(ctx->dpy, ctx->wnd, ctx->wnd, ctx->ctx);
-		m_pDriver->ActivateContext(ctx->wnd, ctx->ctx);
+		m_pDriver->ActivateContext((void *)ctx->wnd, ctx->ctx);
 	}
 }