diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java
index daaefd6f..f31114d3 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java
@@ -41,8 +41,8 @@ public class HiresModelRenderer {
 
 	private final String grassId; 
 	
-	private RenderSettings renderSettings;
-	private BlockStateModelFactory modelFactory;
+	private final RenderSettings renderSettings;
+	private final BlockStateModelFactory modelFactory;
 	
 	public HiresModelRenderer(ResourcePack resourcePack, RenderSettings renderSettings) {
 		this.renderSettings = renderSettings;
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java
index 9fdb5110..f88d751a 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java
@@ -35,8 +35,8 @@
 
 public class BlockStateModelFactory {
 
-	private RenderSettings renderSettings;
-	private ResourcePack resourcePack;
+	private final RenderSettings renderSettings;
+	private final ResourcePack resourcePack;
 	
 	public BlockStateModelFactory(ResourcePack resourcePack, RenderSettings renderSettings) {
 		this.renderSettings = renderSettings;
@@ -91,6 +91,6 @@ private BlockStateModel createModel(Block block, BlockState blockState) throws N
 		
 	}
 	
-	private BlockState WATERLOGGED_BLOCKSTATE = new BlockState("minecraft:water");
+	private final static BlockState WATERLOGGED_BLOCKSTATE = new BlockState("minecraft:water");
 	
 }