diff --git a/src/Nazara/Graphics/DepthPipelinePass.cpp b/src/Nazara/Graphics/DepthPipelinePass.cpp
index e127f7b8f..56b485dd9 100644
--- a/src/Nazara/Graphics/DepthPipelinePass.cpp
+++ b/src/Nazara/Graphics/DepthPipelinePass.cpp
@@ -134,10 +134,7 @@ namespace Nz
 
 		depthPrepass.SetExecutionCallback([&]()
 		{
-			if (m_rebuildCommandBuffer)
-				return FramePassExecution::UpdateAndExecute;
-			else
-				return FramePassExecution::Execute;
+			return (m_rebuildCommandBuffer) ? FramePassExecution::UpdateAndExecute : FramePassExecution::Execute;
 		});
 
 		depthPrepass.SetCommandCallback([this](CommandBufferBuilder& builder, const Recti& /*renderRect*/)
diff --git a/src/Nazara/Graphics/ForwardPipelinePass.cpp b/src/Nazara/Graphics/ForwardPipelinePass.cpp
index 57c05a373..f7f12640b 100644
--- a/src/Nazara/Graphics/ForwardPipelinePass.cpp
+++ b/src/Nazara/Graphics/ForwardPipelinePass.cpp
@@ -279,10 +279,7 @@ namespace Nz
 
 		forwardPass.SetExecutionCallback([&]()
 		{
-			if (m_rebuildCommandBuffer)
-				return FramePassExecution::UpdateAndExecute;
-			else
-				return FramePassExecution::Execute;
+			return (m_rebuildCommandBuffer) ? FramePassExecution::UpdateAndExecute : FramePassExecution::Execute;
 		});
 
 		forwardPass.SetCommandCallback([this](CommandBufferBuilder& builder, const Recti& /*renderRect*/)
diff --git a/src/Nazara/Graphics/SubmeshRenderer.cpp b/src/Nazara/Graphics/SubmeshRenderer.cpp
index 6b048d88b..7882d2679 100644
--- a/src/Nazara/Graphics/SubmeshRenderer.cpp
+++ b/src/Nazara/Graphics/SubmeshRenderer.cpp
@@ -114,6 +114,7 @@ namespace Nz
 				const auto& matSettings = materialPass.GetSettings();
 				if (std::size_t bindingIndex = matSettings->GetPredefinedBinding(PredefinedShaderBinding::InstanceDataUbo); bindingIndex != MaterialSettings::InvalidIndex)
 				{
+					assert(currentWorldInstance);
 					const auto& instanceBuffer = currentWorldInstance->GetInstanceBuffer();
 
 					auto& bindingEntry = m_bindingCache.emplace_back();
@@ -155,6 +156,7 @@ namespace Nz
 					};
 				}
 
+				assert(currentPipeline);
 				ShaderBindingPtr drawDataBinding = currentPipeline->GetPipelineInfo().pipelineLayout->AllocateShaderBinding(0);
 				drawDataBinding->Update(m_bindingCache.data(), m_bindingCache.size());