diff --git a/src/xrt/auxiliary/util/u_timing_render.c b/src/xrt/auxiliary/util/u_timing_render.c
index c8e8120a830f7671c4e90d80fc0b2a656afc693f..c73a5f96fba71b289650b46bdbb67a0b7631e2af 100644
--- a/src/xrt/auxiliary/util/u_timing_render.c
+++ b/src/xrt/auxiliary/util/u_timing_render.c
@@ -170,7 +170,9 @@ calc_period(const struct render_timing *rt)
 	// Error checking.
 	uint64_t base_period_ns = min_period(rt);
 	if (base_period_ns == 0) {
+#ifndef _WIN32
 		assert(false && "Have not yet received and samples from timing driver.");
+#endif
 		base_period_ns = U_TIME_1MS_IN_NS * 16; // Sure
 	}
 
diff --git a/src/xrt/compositor/multi/comp_multi_system.c b/src/xrt/compositor/multi/comp_multi_system.c
index 1f48a4dd9d8fc7abcdcfe0f4264b20b7eb565640..3c82814089a81fd43968fd0bf83877667f2a09fd 100644
--- a/src/xrt/compositor/multi/comp_multi_system.c
+++ b/src/xrt/compositor/multi/comp_multi_system.c
@@ -521,6 +521,11 @@ comp_multi_create_system_compositor(struct xrt_compositor_native *xcn,
 		return XRT_ERROR_THREADING_INIT_FAILURE;
 	}
 
+	ret = os_mutex_init(&msc->list_and_timing_lock);
+	if (ret < 0) {
+		return XRT_ERROR_THREADING_INIT_FAILURE;
+	}
+
 	os_thread_helper_start(&msc->oth, thread_func, msc);
 
 	*out_xsysc = &msc->base;
diff --git a/src/xrt/targets/gui/gui_sdl2.c b/src/xrt/targets/gui/gui_sdl2.c
index 2ab5faf693b952d919a0b2d3d85df53469d5a12d..79ee4da099237ddc2c75ca5ae46577259d144d56 100644
--- a/src/xrt/targets/gui/gui_sdl2.c
+++ b/src/xrt/targets/gui/gui_sdl2.c
@@ -100,7 +100,7 @@ gui_sdl2_init(struct sdl2_program *p)
 	SDL_GL_SetSwapInterval(1); // Enable vsync
 
 	// Setup OpenGL bindings.
-	bool err = gladLoadGL((GLADloadfunc)SDL_GL_GetProcAddress) == 0;
+	bool err = gladLoadGL() == 0;
 	if (err) {
 		return -1;
 	}
diff --git a/src/xrt/targets/openxr/oxr_sdl2_hack.c b/src/xrt/targets/openxr/oxr_sdl2_hack.c
index 37423390cd494269b6322bf58f2015b82bafad44..39238b1580468b141fa07fffc77f0b7ce5dbe703 100644
--- a/src/xrt/targets/openxr/oxr_sdl2_hack.c
+++ b/src/xrt/targets/openxr/oxr_sdl2_hack.c
@@ -120,7 +120,7 @@ sdl2_window_init(struct sdl2_program *p)
 	SDL_GL_SetSwapInterval(1); // Enable vsync
 
 	// Setup OpenGL bindings.
-	bool err = gladLoadGL((GLADloadfunc)SDL_GL_GetProcAddress) == 0;
+	bool err = gladLoadGL() == 0;
 	if (err) {
 		U_LOG_E("Failed to load GL functions!");
 		return;