diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index aa82390c51..36885d0d20 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -57,7 +57,6 @@ voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true
 
 # Graphics
 winit = {version = "0.28.6", features = ["serde"]}
-# naga has an issue for spirv in wgpu 18.0
 wgpu = { version = "0.18.0", default-features = false, features = ["trace", "spirv", "glsl"] }
 wgpu-profiler = "0.15.0"
 bytemuck = { version="1.7", features=["derive"] }
diff --git a/voxygen/src/scene/simple.rs b/voxygen/src/scene/simple.rs
index be3515ab76..c99c0cb1d9 100644
--- a/voxygen/src/scene/simple.rs
+++ b/voxygen/src/scene/simple.rs
@@ -105,12 +105,14 @@ impl Scene {
 
         let data = GlobalModel {
             globals: renderer.create_consts(&[Globals::default()]),
-            lights: renderer.create_consts(&[Light::default(); 20]),
-            shadows: renderer.create_consts(&[Shadow::default(); 24]),
+            lights: renderer.create_consts(&[Light::default(); crate::scene::MAX_LIGHT_COUNT]),
+            shadows: renderer.create_consts(&[Shadow::default(); crate::scene::MAX_SHADOW_COUNT]),
             shadow_mats: renderer.create_shadow_bound_locals(&[ShadowLocals::default()]),
             rain_occlusion_mats: renderer
                 .create_rain_occlusion_bound_locals(&[RainOcclusionLocals::default()]),
-            point_light_matrices: Box::new([PointLightMatrix::default(); 126]),
+            point_light_matrices: Box::new(
+                [PointLightMatrix::default(); crate::scene::MAX_POINT_LIGHT_MATRICES_COUNT],
+            ),
         };
         let lod = Lod::new(renderer, client, settings);