diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 2d9cbfd2c7..93d52289d9 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -69,6 +69,7 @@ bool ISWACygnet::initialize(){
 
 bool ISWACygnet::deinitialize(){
 	_parent = nullptr;
+	return true;
 }
 
 void ISWACygnet::render(){
diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index 069947aa54..58a8715e13 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -24,6 +24,10 @@
 
 #ifndef __ISWACYGNET_H__
 #define __ISWACYGNET_H__
+
+#define _USE_MATH_DEFINES
+#include <math.h>
+
 #include <openspace/properties/propertyowner.h>
 #include <memory>
 #include <modules/kameleon/include/kameleonwrapper.h>
diff --git a/modules/iswa/rendering/iswamanager.cpp b/modules/iswa/rendering/iswamanager.cpp
index a2f7938060..5226b0c948 100644
--- a/modules/iswa/rendering/iswamanager.cpp
+++ b/modules/iswa/rendering/iswamanager.cpp
@@ -46,15 +46,21 @@ bool ISWAManager::initialize(){
 	addISWACygnet("${OPENSPACE_DATA}/BATSRUS.cdf");
 	// addISWACygnet("${OPENSPACE_DATA}/ENLIL.cdf");
 	addISWACygnet("${OPENSPACE_DATA}/test.png");
+
+	return true;
 }
+
 bool ISWAManager::deinitialize(){
-	for(iSWACygnet : _iSWACygnets)
+	for(auto iSWACygnet : _iSWACygnets)
 		iSWACygnet->deinitialize();
+
+	return true;
 }
-bool ISWAManager::isReady() const {}
+
+bool ISWAManager::isReady() const { return true; }
 
 void ISWAManager::render(const RenderData& data){
-	for(iSWACygnet : _iSWACygnets){
+	for(auto iSWACygnet : _iSWACygnets){
 		if(iSWACygnet->enabled()){
 			iSWACygnet->render();
 		}
@@ -62,7 +68,7 @@ void ISWAManager::render(const RenderData& data){
 } 
 
 void ISWAManager::update(const UpdateData& data){
-	for(iSWACygnet : _iSWACygnets)
+	for(auto iSWACygnet : _iSWACygnets)
 		iSWACygnet->update();
 }
 
diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp
index 11cd3e167f..fce19ca24a 100644
--- a/modules/iswa/rendering/textureplane.cpp
+++ b/modules/iswa/rendering/textureplane.cpp
@@ -68,7 +68,6 @@ bool TexturePlane::initialize(){
 
 	std::thread t = std::thread(std::bind(&TexturePlane::updateTexture, this));
 	t.detach();
-
   
     loadTexture();
   
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index e5a1e4093b..c3e7ab34ef 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -368,11 +368,6 @@ float* KameleonWrapper::getUniformSliceValues(
 
 	_model->loadVariable(var);
 
-	auto vars = _model->getLoadedVariables();
-	for(v :vars){
-		std::cout << v << std::endl;
-	}
-
 	double varMin = _model->getVariableAttribute(var, "actual_min").getAttributeFloat();
 	double varMax = _model->getVariableAttribute(var, "actual_max").getAttributeFloat();
 	
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index a446b9492c..9d4220daa6 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -207,6 +207,8 @@ bool RenderEngine::initialize() {
 #endif // GHOUL_USE_SOIL
   
     ghoul::io::TextureReader::ref().addReader(std::make_shared<ghoul::io::TextureReaderCMAP>());
+
+	return true;
 }
 
 bool RenderEngine::initializeGL() {