diff --git a/include/openspace/util/updatestructures.h b/include/openspace/util/updatestructures.h
index faa10c9a4a..92286f02a7 100644
--- a/include/openspace/util/updatestructures.h
+++ b/include/openspace/util/updatestructures.h
@@ -42,6 +42,9 @@ struct UpdateData {
 };
 
 struct RenderData {
+    RenderData() = delete;
+    RenderData& operator=(const RenderData& rhs) = delete;
+
 	const Camera& camera;
 	psc position;
 	bool doPerformanceMeasurement;
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 487450f7bd..ff22486f0d 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -222,7 +222,6 @@ void RenderableModel::update(const UpdateData& data) {
         _programObject->rebuildFromFile();
 	double _time = data.time;
 
-	double futureTime;
 	//if (_isGhost){
 	//	futureTime = openspace::ImageSequencer2::ref().getNextCaptureTime();
 	//	double remaining = openspace::ImageSequencer2::ref().getNextCaptureTime() - data.time;
diff --git a/modules/base/rendering/renderablepath.cpp b/modules/base/rendering/renderablepath.cpp
index 8e145f220e..49b214c3b3 100644
--- a/modules/base/rendering/renderablepath.cpp
+++ b/modules/base/rendering/renderablepath.cpp
@@ -120,8 +120,8 @@ bool RenderablePath::initialize() {
 bool RenderablePath::deinitialize() {
 	glDeleteVertexArrays(1, &_vaoID);
 	glDeleteBuffers(1, &_vBufferID);
+    Renderable::deinitialize();
 	return true;
-	deinitialize();
 }
 
 bool RenderablePath::isReady() const {
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 045ee51131..28938be76e 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -125,8 +125,8 @@ bool RenderableTrail::initialize() {
 bool RenderableTrail::deinitialize() {
     glDeleteVertexArrays(1, &_vaoID);
     glDeleteBuffers(1, &_vBufferID);
+    Renderable::deinitialize();
     return true;
-	deinitialize();
 }
 
 bool RenderableTrail::isReady() const {