diff --git a/WickedEngine/wiLoader.cpp b/WickedEngine/wiLoader.cpp
index d870ba19b..97d17f3bc 100644
--- a/WickedEngine/wiLoader.cpp
+++ b/WickedEngine/wiLoader.cpp
@@ -1542,7 +1542,7 @@ void VertexGroup::Serialize(wiArchive& archive)
 GPUBuffer Mesh::impostorVBs[VPROP_COUNT];
 
 void Mesh::LoadFromFile(const string& newName, const string& fname
-	, const MaterialCollection& materialColl, list<Armature*> armatures, const string& identifier) {
+	, const MaterialCollection& materialColl, const list<Armature*>& armatures, const string& identifier) {
 	name = newName;
 
 	BYTE* buffer;
diff --git a/WickedEngine/wiLoader.h b/WickedEngine/wiLoader.h
index eece2d345..7f67fabc6 100644
--- a/WickedEngine/wiLoader.h
+++ b/WickedEngine/wiLoader.h
@@ -375,7 +375,7 @@ public:
 	}
 	~Mesh() {}
 	void LoadFromFile(const string& newName, const string& fname
-		, const MaterialCollection& materialColl, list<Armature*> armatures, const string& identifier="");
+		, const MaterialCollection& materialColl, const list<Armature*>& armatures, const string& identifier="");
 	bool buffersComplete;
 	void Optimize();
 	// Object is needed in CreateBuffers because how else would we know if the mesh needs to be deformed?
diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp
index 561f13a1e..3f6df5d98 100644
--- a/WickedEngine/wiRenderer.cpp
+++ b/WickedEngine/wiRenderer.cpp
@@ -1889,7 +1889,7 @@ void wiRenderer::UpdateRenderData(GRAPHICSTHREAD threadID)
 		const CulledList& culledLights = mainCameraCulling.culledLights;
 
 		static LightArrayType* lightArray = (LightArrayType*)_mm_malloc(sizeof(LightArrayType)*MAX_LIGHTS, 16);
-		ZeroMemory(lightArray, sizeof(lightArray));
+		ZeroMemory(lightArray, sizeof(LightArrayType)*MAX_LIGHTS);
 
 		XMMATRIX viewMatrix = cam->GetView();
 
@@ -4855,7 +4855,7 @@ void wiRenderer::UpdateMaterialCB(const MaterialCB& value, GRAPHICSTHREAD thread
 	}
 }
 wiRenderer::APICB apiCB[GRAPHICSTHREAD_COUNT];
-void wiRenderer::SetClipPlane(XMFLOAT4 clipPlane, GRAPHICSTHREAD threadID)
+void wiRenderer::SetClipPlane(const XMFLOAT4& clipPlane, GRAPHICSTHREAD threadID)
 {
 	apiCB[threadID].clipPlane = clipPlane;
 	GetDevice()->UpdateBuffer(constantBuffers[CBTYPE_API], &apiCB[threadID], threadID);
diff --git a/WickedEngine/wiRenderer.h b/WickedEngine/wiRenderer.h
index 6986a39a7..86008013b 100644
--- a/WickedEngine/wiRenderer.h
+++ b/WickedEngine/wiRenderer.h
@@ -436,7 +436,7 @@ public:
 	static void UpdateFrameCB(GRAPHICSTHREAD threadID);
 	static void UpdateCameraCB(Camera* camera, GRAPHICSTHREAD threadID);
 	static void UpdateMaterialCB(const MaterialCB& value, GRAPHICSTHREAD threadID);
-	static void SetClipPlane(XMFLOAT4 clipPlane, GRAPHICSTHREAD threadID);
+	static void SetClipPlane(const XMFLOAT4& clipPlane, GRAPHICSTHREAD threadID);
 	static void SetAlphaRef(float alphaRef, GRAPHICSTHREAD threadID);
 	static void ResetAlphaRef(GRAPHICSTHREAD threadID) { SetAlphaRef(0.75f, threadID); }
 	static void UpdateGBuffer(wiGraphicsTypes::Texture2D* slot0, wiGraphicsTypes::Texture2D* slot1, wiGraphicsTypes::Texture2D* slot2, wiGraphicsTypes::Texture2D* slot3, wiGraphicsTypes::Texture2D* slot4, GRAPHICSTHREAD threadID);
diff --git a/WickedEngine/wiResourceManager.cpp b/WickedEngine/wiResourceManager.cpp
index 81fac91c1..368c0adb4 100644
--- a/WickedEngine/wiResourceManager.cpp
+++ b/WickedEngine/wiResourceManager.cpp
@@ -158,7 +158,7 @@ void* wiResourceManager::add(const wiHashString& name, Data_Type newType
 				wiRenderer::GetDevice()->CreateGeometryShader(buffer, bufferSize, nullptr, shader);
 				if (streamOutDecl != nullptr && elementCount > 0){
 					wiRenderer::GetDevice()->CreateGeometryShaderWithStreamOutput(buffer, bufferSize, streamOutDecl,
-						elementCount, NULL, 0, shader ? 0 : SO_NO_RASTERIZED_STREAM, NULL, shader);
+						elementCount, NULL, 0, SO_NO_RASTERIZED_STREAM, NULL, shader);
 				}
 				delete[] buffer;
 				success = shader;
diff --git a/WickedEngine/wiSound_BindLua.cpp b/WickedEngine/wiSound_BindLua.cpp
index 0f5c6ef77..f2ba4c2dc 100644
--- a/WickedEngine/wiSound_BindLua.cpp
+++ b/WickedEngine/wiSound_BindLua.cpp
@@ -100,9 +100,8 @@ Luna<wiSoundEffect_BindLua>::PropertyType wiSoundEffect_BindLua::properties[] =
 	{ NULL, NULL }
 };
 
-wiSoundEffect_BindLua::wiSoundEffect_BindLua(lua_State *L)
+wiSoundEffect_BindLua::wiSoundEffect_BindLua(lua_State *L) :wiSound_BindLua()
 {
-	wiSoundEffect_BindLua::wiSound_BindLua();
 	int argc = wiLua::SGetArgCount(L);
 	if (argc > 0)
 	{
@@ -132,9 +131,8 @@ Luna<wiMusic_BindLua>::PropertyType wiMusic_BindLua::properties[] = {
 	{ NULL, NULL }
 };
 
-wiMusic_BindLua::wiMusic_BindLua(lua_State *L)
+wiMusic_BindLua::wiMusic_BindLua(lua_State *L) :wiSound_BindLua()
 {
-	wiSoundEffect_BindLua::wiSound_BindLua();
 	int argc = wiLua::SGetArgCount(L);
 	if (argc > 0)
 	{
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index 23c13fb1c..fbbbff852 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -7,7 +7,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 11;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 24;
+	const int revision = 25;
 
 
 	long GetVersion()