diff --git a/bin/resources/god_rays.nzsl b/bin/resources/god_rays.nzsl
index 195f3aa29..b1b14e7e9 100644
--- a/bin/resources/god_rays.nzsl
+++ b/bin/resources/god_rays.nzsl
@@ -19,7 +19,7 @@ struct Settings
 	decay: f32,
 	density: f32,
 	weight: f32,
-	lightPosition: vec2<f32>, //< Switch to world position
+	lightPosition: vec2<f32>, //< TODO: Switch to world position
 }
 
 const SampleCount: i32 = 200;
diff --git a/bin/resources/skybox.nzsl b/bin/resources/skybox.nzsl
index a08f826b5..93dc98872 100644
--- a/bin/resources/skybox.nzsl
+++ b/bin/resources/skybox.nzsl
@@ -51,10 +51,7 @@ fn main(input: VertIn) -> VertOut
 {
     // Set translation part to zero
     let rotationMat = viewerData.viewMatrix;
-    // rotationMat[3].xyz = vec3<f32>(0.0, 0.0, 0.0); // Requires SPIRV generator to handle swizzle for store expressions
-    rotationMat[3][0] = 0.0;
-    rotationMat[3][1] = 0.0;
-    rotationMat[3][2] = 0.0;
+    rotationMat[3].xyz = vec3<f32>(0.0, 0.0, 0.0);
 
     let output: VertOut;
     output.position = viewerData.projectionMatrix * rotationMat * vec4<f32>(input.position, 1.0);
diff --git a/src/Nazara/Shader/SpirvConstantCache.cpp b/src/Nazara/Shader/SpirvConstantCache.cpp
index 53441fb51..0bbe8d264 100644
--- a/src/Nazara/Shader/SpirvConstantCache.cpp
+++ b/src/Nazara/Shader/SpirvConstantCache.cpp
@@ -570,12 +570,14 @@ namespace Nz
 
 			case ImageType::E1D_Array:
 				imageType.arrayed = true;
+				[[fallthrough]];
 			case ImageType::E1D:
 				imageType.dim = SpirvDim::Dim1D;
 				break;
 
 			case ImageType::E2D_Array:
 				imageType.arrayed = true;
+				[[fallthrough]];
 			case ImageType::E2D:
 				imageType.dim = SpirvDim::Dim2D;
 				break;
diff --git a/xmake-repo/packages/q/qt5base/xmake.lua b/xmake-repo/packages/q/qt5base/xmake.lua
index e544bb77d..cadffc681 100644
--- a/xmake-repo/packages/q/qt5base/xmake.lua
+++ b/xmake-repo/packages/q/qt5base/xmake.lua
@@ -43,7 +43,12 @@ package("qt5base")
     end)
 
     on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function (package)
-        os.vrunv("python", {"-m", "ensurepip"})
+        -- ensurepip is dropped in recent releases
+        try
+        {
+            function () os.vrunv("python", {"-m", "ensurepip"}) end
+        }
+        
         os.vrunv("python", {"-m", "pip", "install", "-U", "pip"})
         os.vrunv("python", {"-m", "pip", "install", "aqtinstall"})
 
diff --git a/xmake.lua b/xmake.lua
index 29068145d..521684f7b 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -229,10 +229,10 @@ rule("build_rendererplugins")
 	on_load(function (target)
 		local deps = table.wrap(target:get("deps"))
 
-		if target:kind() == "binary" and (table.find_first(deps, "NazaraRenderer") or table.find_first(deps, "NazaraGraphics")) then
+		if target:kind() == "binary" and (table.contains(deps, "NazaraRenderer") or table.contains(deps, "NazaraGraphics")) then
 			for name, _ in pairs(modules) do
 				local depName = "Nazara" .. name
-				if name:match("^.+Renderer$") and table.find_first(deps, depName) == nil then -- don't overwrite dependency
+				if name:match("^.+Renderer$") and table.contains(deps, depName) == nil then -- don't overwrite dependency
 					target:add("deps", depName, {inherit = false})
 				end
 			end