diff --git a/examples/VulkanTest/main.cpp b/examples/VulkanTest/main.cpp
index fdabfd539..1411ac0ab 100644
--- a/examples/VulkanTest/main.cpp
+++ b/examples/VulkanTest/main.cpp
@@ -110,7 +110,7 @@ int main()
 	textureBinding.shaderStageFlags = Nz::ShaderStageType::Fragment;
 	textureBinding.type = Nz::ShaderBindingType::Texture;
 
-	std::shared_ptr<Nz::RenderPipelineLayout> renderPipelineLayout = device->InstantiateRenderPipelineLayout(pipelineLayoutInfo);
+	std::shared_ptr<Nz::RenderPipelineLayout> renderPipelineLayout = device->InstantiateRenderPipelineLayout(std::move(pipelineLayoutInfo));
 
 	Nz::ShaderBindingPtr shaderBinding = renderPipelineLayout->AllocateShaderBinding();
 
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Sampler.inl b/include/Nazara/OpenGLRenderer/Wrapper/Sampler.inl
index b48ab4c03..6edf4cf5b 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Sampler.inl
+++ b/include/Nazara/OpenGLRenderer/Wrapper/Sampler.inl
@@ -39,7 +39,7 @@ namespace Nz::GL
 		context.glSamplerParameteriv(m_objectId, pname, param);
 	}
 
-	inline GLuint Sampler::CreateHelper(OpenGLDevice& device, const Context& context)
+	inline GLuint Sampler::CreateHelper(OpenGLDevice& /*device*/, const Context& context)
 	{
 		GLuint sampler = 0;
 		context.glGenSamplers(1U, &sampler);
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl b/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl
index ee6ebf850..fe062149f 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl
+++ b/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl
@@ -11,7 +11,9 @@ namespace Nz::GL
 	inline void Shader::Compile()
 	{
 		assert(m_objectId);
-		m_device->GetReferenceContext().glCompileShader(m_objectId);
+
+		const Context& context = EnsureDeviceContext();
+		context.glCompileShader(m_objectId);
 	}
 
 	inline bool Shader::GetCompilationStatus(std::string* error)
diff --git a/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp b/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
index 19ebfd99c..333d5d424 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
@@ -8,6 +8,7 @@
 #include <Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLShaderStage.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
+#include <Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
@@ -74,6 +75,7 @@ namespace Nz
 
 	std::unique_ptr<TextureSampler> OpenGLDevice::InstantiateTextureSampler(const TextureSamplerInfo& params)
 	{
-		return {};
+		return std::make_unique<OpenGLTextureSampler>(*this, params);
 	}
+	
 }