diff --git a/lib/ivis_opengl/pielighting.h b/lib/ivis_opengl/pielighting.h
index d7047f791f4..1c6077711d3 100644
--- a/lib/ivis_opengl/pielighting.h
+++ b/lib/ivis_opengl/pielighting.h
@@ -79,7 +79,7 @@ struct ILightingManager
 
 	virtual void ComputeFrameData(const LightingData& data, LightMap& lightmap, const glm::mat4& worldViewProjectionMatrix) = 0;
 
-	PointLightBuckets getPointLightBuckets() const
+	const PointLightBuckets& getPointLightBuckets() const
 	{
 		return currentPointLightBuckets;
 	}
diff --git a/src/terrain.h b/src/terrain.h
index cb06cae7700..1bcd9df9817 100644
--- a/src/terrain.h
+++ b/src/terrain.h
@@ -27,13 +27,14 @@
 #include "terrain_defs.h"
 
 struct ShadowCascadesInfo;
+struct LightMap;
 
 void loadTerrainTextures(MAP_TILESET mapTileset);
 
 bool initTerrain();
 void shutdownTerrain();
 
-void perFrameTerrainUpdates(const struct LightMap& lightData);
+void perFrameTerrainUpdates(const LightMap& lightData);
 void drawTerrainDepthOnly(const glm::mat4 &mvp);
 void drawTerrain(const glm::mat4 &mvp, const glm::mat4& viewMatrix, const Vector3f &cameraPos, const Vector3f &sunPos, const ShadowCascadesInfo& shadowMVPMatrix);
 void drawWater(const glm::mat4 &ModelViewProjection, const Vector3f &cameraPos, const Vector3f &sunPos);