diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl
index b15ad91c7..ccc70a6e2 100644
--- a/include/Nazara/Math/Matrix4.inl
+++ b/include/Nazara/Math/Matrix4.inl
@@ -1031,16 +1031,6 @@ namespace Nz
 		return MakeTransform(-(invRot * translation), invRot);
 	}
 
-	template<typename T>
-	Matrix4<T>& Matrix4<T>::MakeTransformInverse(const Vector3<T>& translation, const Quaternion<T>& rotation, const Vector3<T>& scale)
-	{
-		// A view matrix must apply an inverse transformation of the 'world' matrix
-		Quaternion<T> invRot = rotation.GetConjugate(); // Inverse of the rotation
-		Vector3<T> invScale = T(1.0) / scale;
-
-		return MakeTransform(-(invScale * (invRot * translation)), invRot, invScale);
-	}
-
 	/*!
 	* \brief Makes the matrix an inverse transform matrix (aka view matrix)
 	* \return A reference to this matrix
@@ -1706,15 +1696,6 @@ namespace Nz
 		return mat;
 	}
 
-	template<typename T>
-	Matrix4<T> Matrix4<T>::TransformInverse(const Vector3<T>& translation, const Quaternion<T>& rotation, const Vector3<T>& scale)
-	{
-		Matrix4 mat;
-		mat.MakeTransformInverse(translation, rotation, scale);
-
-		return mat;
-	}
-
 	/*!
 	* \brief Shorthand for the 'view' matrix
 	* \return A Matrix4 which is the 'view matrix'
diff --git a/src/Nazara/Graphics/BasicMaterial.cpp b/src/Nazara/Graphics/BasicMaterial.cpp
index 263e7021f..4039c79ad 100644
--- a/src/Nazara/Graphics/BasicMaterial.cpp
+++ b/src/Nazara/Graphics/BasicMaterial.cpp
@@ -151,14 +151,14 @@ namespace Nz
 			options.defaultValues
 		});
 
-		FieldOffsets skeletalOffsets(StructLayout::Std140);
-		skeletalOffsets.AddMatrixArray(StructFieldType::Float1, 4, 4, true, 100);
+		nzsl::FieldOffsets skeletalOffsets(nzsl::StructLayout::Std140);
+		skeletalOffsets.AddMatrixArray(nzsl::StructFieldType::Float1, 4, 4, true, 100);
 
 		settings.sharedUniformBlocks.push_back({
 			6,
 			"SkeletalData",
 			{},
-			ShaderStageType::Vertex
+			nzsl::ShaderStageType::Vertex
 		});
 
 		// Common data