diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
index f18c8ec1..bf983314 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
@@ -70,7 +70,7 @@ namespace PolyVox
 			std::list<Vector3DInt32>* listResult,
 			float fHBias = 1.0,
 			uint32_t uMaxNoOfNodes = 10000,
-			Connectivity connectivity = TwentySixConnected,
+			Connectivity requiredConnectivity = TwentySixConnected,
 			polyvox_function<bool (const VolumeType*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator,
 			polyvox_function<void (float)> funcProgressCallback = 0
 		)
@@ -78,7 +78,7 @@ namespace PolyVox
 			,start(v3dStart)
 			,end(v3dEnd)
 			,result(listResult)
-			,connectivity(connectivity)
+			,connectivity(requiredConnectivity)
 			,hBias(fHBias)
 			,maxNumberOfNodes(uMaxNoOfNodes)
 			,isVoxelValidForPath(funcIsVoxelValidForPath)
diff --git a/library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl b/library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
index b5df8f03..28a44f25 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
@@ -137,7 +137,6 @@ namespace PolyVox
 		const int32_t iMaxYVolSpace = m_regSliceCurrent.getUpperCorner().getY();
 
 		int32_t iZVolSpace = m_regSliceCurrent.getLowerCorner().getZ();
-		uint32_t uZRegSpace = iZVolSpace - m_regSizeInVoxels.getLowerCorner().getZ();
 
 		//Process the lower left corner
 		int32_t iYVolSpace = m_regSliceCurrent.getLowerCorner().getY();
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h b/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
index 03199f7e..0fbf2e96 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
@@ -92,8 +92,7 @@ namespace PolyVox
 
 		float f(void) const
 		{
-			float f = gVal + hVal;
-			return f;
+			return gVal + hVal;
 		}
 	};