diff --git a/alvr/client_core/src/graphics/mod.rs b/alvr/client_core/src/graphics/mod.rs
index 8f71014b3a..f6ff8e0baf 100644
--- a/alvr/client_core/src/graphics/mod.rs
+++ b/alvr/client_core/src/graphics/mod.rs
@@ -320,10 +320,7 @@ impl GraphicsContext {
             &DeviceDescriptor {
                 label: None,
                 required_features: Features::PUSH_CONSTANTS,
-                required_limits: Limits {
-                    max_push_constant_size: 72,
-                    ..Default::default()
-                },
+                required_limits: adapter.limits(),
             },
             None,
         ))
diff --git a/alvr/client_openxr/src/lib.rs b/alvr/client_openxr/src/lib.rs
index de7b969d8e..bfe9fb16f5 100644
--- a/alvr/client_openxr/src/lib.rs
+++ b/alvr/client_openxr/src/lib.rs
@@ -449,6 +449,7 @@ pub fn entry_point() {
                 (layer, vsync_time)
             };
 
+            graphics_context.make_current();
             let res = xr_frame_stream.end(
                 to_xr_time(display_time),
                 xr::EnvironmentBlendMode::OPAQUE,