diff --git a/open_engine/include/open_engine/renderer/uniform_buffer.hpp b/open_engine/include/open_engine/renderer/uniform_buffer.hpp
index c6ccf6f..d38afe8 100644
--- a/open_engine/include/open_engine/renderer/uniform_buffer.hpp
+++ b/open_engine/include/open_engine/renderer/uniform_buffer.hpp
@@ -8,7 +8,7 @@ namespace OpenEngine {
     class UniformBuffer
     {
         public:
-            virtual ~UniformBuffer() {}
+            virtual ~UniformBuffer() = default;
             virtual void SetData(const void* data, uint32_t size,
                     uint32_t offset = 0) = 0;
 
diff --git a/open_engine/src/open_engine/renderer/renderer3d.cpp b/open_engine/src/open_engine/renderer/renderer3d.cpp
index 58120ba..291bfb7 100644
--- a/open_engine/src/open_engine/renderer/renderer3d.cpp
+++ b/open_engine/src/open_engine/renderer/renderer3d.cpp
@@ -205,8 +205,10 @@ namespace OpenEngine {
     
     void Renderer3D::Shutdown()
     {
-        renderer_data.camera_uniform_buffer.reset();
         renderer_data.color_shader_3d.reset();
+        renderer_data.camera_uniform_buffer.reset();
+        renderer_data.transform_uniform_buffer.reset();
+        renderer_data.material_uniform_buffer.reset();
     }
     
     void Renderer3D::BeginScene(const SceneCamera& camera, const glm::mat4& transform)