diff --git a/src/main/java/openblocks/client/SoundEventsManager.java b/src/main/java/openblocks/client/SoundEventsManager.java
index b0ef686d3..039e41dd3 100644
--- a/src/main/java/openblocks/client/SoundEventsManager.java
+++ b/src/main/java/openblocks/client/SoundEventsManager.java
@@ -125,7 +125,7 @@ public void tickUpdate() {
         }
     }
 
-    private ManualDisplayList notPumpkinOverlay = new ManualDisplayList();
+    private final ManualDisplayList notPumpkinOverlay = new ManualDisplayList();
     private static final ResourceLocation notPumpkin = new ResourceLocation(
             "openblocks:textures/misc/glasses_obsidian.png");
 
diff --git a/src/main/java/openblocks/client/SoundIconRegistry.java b/src/main/java/openblocks/client/SoundIconRegistry.java
index aedd5dcee..aa542495a 100644
--- a/src/main/java/openblocks/client/SoundIconRegistry.java
+++ b/src/main/java/openblocks/client/SoundIconRegistry.java
@@ -126,8 +126,8 @@ private void registerIcons(int type, IIconRegister registry) {
 
     private static class MobSounds implements ISoundCategory {
 
-        private Map<String, MobIcons> mobs = Maps.newHashMap();
-        private MobIcons unknownMob;
+        private final Map<String, MobIcons> mobs = Maps.newHashMap();
+        private final MobIcons unknownMob;
 
         private static MobIcons createMobIcons(String innerIcon, int innerColor, int frameColor) {
             IDrawableIcon frame = itemIcon(ICON_FRAME, frameColor);
@@ -205,7 +205,7 @@ public void registerIcons(int type, IIconRegister registry) {
 
     private final Map<String, MappedCategory> roots = Maps.newHashMap();
 
-    private Map<ResourceLocation, IDrawableIcon> iconCache = Maps.newConcurrentMap();
+    private final Map<ResourceLocation, IDrawableIcon> iconCache = Maps.newConcurrentMap();
 
     public static final int DEFAULT_COLOR = 0xFFFFFF;
 
diff --git a/src/main/java/openblocks/client/gui/GuiDonationStation.java b/src/main/java/openblocks/client/gui/GuiDonationStation.java
index e03233940..2877f02d5 100644
--- a/src/main/java/openblocks/client/gui/GuiDonationStation.java
+++ b/src/main/java/openblocks/client/gui/GuiDonationStation.java
@@ -26,9 +26,9 @@ public class GuiDonationStation extends BaseGuiContainer<ContainerDonationStatio
     private final int PROMPT_REPLY_ACTION = 0;
 
     private URI displayedURI = null;
-    private GuiComponentLabel lblModName;
-    private GuiComponentTextButton buttonDonate;
-    private GuiComponentLabel lblAuthors;
+    private final GuiComponentLabel lblModName;
+    private final GuiComponentTextButton buttonDonate;
+    private final GuiComponentLabel lblAuthors;
 
     public GuiDonationStation(ContainerDonationStation container) {
         super(container, 176, 172, "openblocks.gui.donationstation");
diff --git a/src/main/java/openblocks/client/gui/GuiDrawingTable.java b/src/main/java/openblocks/client/gui/GuiDrawingTable.java
index cea6bac9c..cf0179368 100644
--- a/src/main/java/openblocks/client/gui/GuiDrawingTable.java
+++ b/src/main/java/openblocks/client/gui/GuiDrawingTable.java
@@ -19,7 +19,7 @@ public class GuiDrawingTable extends BaseGuiContainer<ContainerDrawingTable> {
 
     public static final int BUTTON_DRAW = 0;
 
-    private GuiComponentSprite iconDisplay;
+    private final GuiComponentSprite iconDisplay;
 
     private int patternIndex = 0;
 
diff --git a/src/main/java/openblocks/client/gui/GuiProjector.java b/src/main/java/openblocks/client/gui/GuiProjector.java
index 630889db9..e14364eaa 100644
--- a/src/main/java/openblocks/client/gui/GuiProjector.java
+++ b/src/main/java/openblocks/client/gui/GuiProjector.java
@@ -28,7 +28,7 @@ public class GuiProjector extends BaseGuiContainer<ContainerProjector> {
 
     private static final int VIEW_HEIGHT = 138;
     private static final int VIEW_WIDTH = 160;
-    private TrackballWrapper trackball = new TrackballWrapper(1, 150);
+    private final TrackballWrapper trackball = new TrackballWrapper(1, 150);
 
     private static IMouseDownListener createRotationListener(final IRotatable proxy, final int direction) {
         return new IMouseDownListener() {
@@ -69,7 +69,7 @@ protected BaseComposite createRoot() {
     }
 
     private boolean isInitialized;
-    private int scale = 90;
+    private final int scale = 90;
     private double mapHeight = 2;
 
     @Override
diff --git a/src/main/java/openblocks/client/gui/StandardPalette.java b/src/main/java/openblocks/client/gui/StandardPalette.java
index 8a455cfeb..8db9dad63 100644
--- a/src/main/java/openblocks/client/gui/StandardPalette.java
+++ b/src/main/java/openblocks/client/gui/StandardPalette.java
@@ -9,7 +9,7 @@ public enum StandardPalette {
     red(0xc88a84),
     purple(0xc884bf);
 
-    private int color;
+    private final int color;
 
     StandardPalette(int col) {
         this.color = col;
diff --git a/src/main/java/openblocks/client/gui/page/IntroPage.java b/src/main/java/openblocks/client/gui/page/IntroPage.java
index 81d632659..00a9a769e 100644
--- a/src/main/java/openblocks/client/gui/page/IntroPage.java
+++ b/src/main/java/openblocks/client/gui/page/IntroPage.java
@@ -9,7 +9,7 @@
 
 public class IntroPage extends PageBase {
 
-    private GuiComponentSprite image;
+    private final GuiComponentSprite image;
 
     private static final ResourceLocation texture = new ResourceLocation("openblocks:textures/gui/bookimage.png");
     public static IIcon iconImage = new FakeIcon(0, 0.7421875f, 0, 0.546875f, 95, 70);
diff --git a/src/main/java/openblocks/client/model/ModelCannon.java b/src/main/java/openblocks/client/model/ModelCannon.java
index 851214957..8c623b86b 100644
--- a/src/main/java/openblocks/client/model/ModelCannon.java
+++ b/src/main/java/openblocks/client/model/ModelCannon.java
@@ -8,15 +8,15 @@
 
 public class ModelCannon extends ModelBase {
 
-    private double[] keyframes = new double[] { 0, 0.5, 1, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1, 0 };
+    private final double[] keyframes = new double[] { 0, 0.5, 1, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1, 0 };
 
     ModelRenderer body;
     ModelRenderer shooter;
     ModelRenderer base;
     ModelRenderer wheel;
 
-    private float deg30 = (float) Math.toRadians(30);
-    private float deg180 = (float) Math.toRadians(180);
+    private final float deg30 = (float) Math.toRadians(30);
+    private final float deg180 = (float) Math.toRadians(180);
 
     public ModelCannon() {
         textureWidth = 64;
diff --git a/src/main/java/openblocks/client/model/ModelSleepingBag.java b/src/main/java/openblocks/client/model/ModelSleepingBag.java
index 3cb7eb4b9..b4e39a91b 100644
--- a/src/main/java/openblocks/client/model/ModelSleepingBag.java
+++ b/src/main/java/openblocks/client/model/ModelSleepingBag.java
@@ -8,8 +8,8 @@ public class ModelSleepingBag extends ModelBiped {
 
     public static final ModelSleepingBag instance = new ModelSleepingBag();
 
-    private ModelRenderer main;
-    private ModelRenderer pillow;
+    private final ModelRenderer main;
+    private final ModelRenderer pillow;
 
     public ModelSleepingBag() {
 
diff --git a/src/main/java/openblocks/client/renderer/block/BlockCanvasRenderer.java b/src/main/java/openblocks/client/renderer/block/BlockCanvasRenderer.java
index 6a6269850..716ad7e46 100644
--- a/src/main/java/openblocks/client/renderer/block/BlockCanvasRenderer.java
+++ b/src/main/java/openblocks/client/renderer/block/BlockCanvasRenderer.java
@@ -19,7 +19,7 @@
 
 public class BlockCanvasRenderer implements IBlockRenderer<BlockCanvas> {
 
-    public FixedRenderBlocks renderBlocks = new FixedRenderBlocks();
+    private final FixedRenderBlocks renderBlocks = new FixedRenderBlocks();
 
     @Override
     public void renderInventoryBlock(BlockCanvas block, int metadata, int modelID, RenderBlocks renderer) {
@@ -71,6 +71,8 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, BlockCa
             RenderUtils.resetFacesOnRenderer(renderBlocks);
         }
 
+        renderBlocks.setWorld(null);
+
         return visible;
     }
 }
diff --git a/src/main/java/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java
index a0b870617..4f3f1f383 100644
--- a/src/main/java/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java
+++ b/src/main/java/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java
@@ -15,7 +15,7 @@
 
 public class EntityGoldenEyeRenderer extends Render {
 
-    private Tessellator tes = new Tessellator();
+    private final Tessellator tes = new Tessellator();
 
     @Override
     public void doRender(Entity entity, double x, double y, double z, float f1, float partialTickTime) {
diff --git a/src/main/java/openblocks/client/renderer/entity/EntityLuggageRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityLuggageRenderer.java
index e87a7c026..97e59b1f8 100644
--- a/src/main/java/openblocks/client/renderer/entity/EntityLuggageRenderer.java
+++ b/src/main/java/openblocks/client/renderer/entity/EntityLuggageRenderer.java
@@ -15,7 +15,7 @@
 
 public class EntityLuggageRenderer extends RenderLiving {
 
-    private static ModelBase luggageModel = new ModelLuggage();
+    private static final ModelBase luggageModel = new ModelLuggage();
 
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/luggage.png");
     private static final ResourceLocation textureSpecial = new ResourceLocation(
diff --git a/src/main/java/openblocks/client/renderer/item/ItemRendererDevNull.java b/src/main/java/openblocks/client/renderer/item/ItemRendererDevNull.java
index 4c0a722a6..0f1be5f4f 100644
--- a/src/main/java/openblocks/client/renderer/item/ItemRendererDevNull.java
+++ b/src/main/java/openblocks/client/renderer/item/ItemRendererDevNull.java
@@ -51,7 +51,7 @@ protected Counter initialValue() {
         }
     };
 
-    private DisplayListWrapper cube = new DisplayListWrapper() {
+    private final DisplayListWrapper cube = new DisplayListWrapper() {
 
         @Override
         public void compile() {
diff --git a/src/main/java/openblocks/client/renderer/item/ItemRendererLuggage.java b/src/main/java/openblocks/client/renderer/item/ItemRendererLuggage.java
index ee82914ee..13a229b58 100644
--- a/src/main/java/openblocks/client/renderer/item/ItemRendererLuggage.java
+++ b/src/main/java/openblocks/client/renderer/item/ItemRendererLuggage.java
@@ -39,16 +39,20 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
             GL11.glPushMatrix();
 
             EntityLuggage luggage = this.luggage.get();
-            luggage.worldObj = Minecraft.getMinecraft().theWorld;
+            try {
+                luggage.worldObj = Minecraft.getMinecraft().theWorld;
 
-            GL11.glTranslatef(0.5f, 0, 0.5f);
-            luggage.getInventory().clearAndSetSlotCount(27);
-            if (item.hasTagCompound()) {
-                luggage.getInventory().readFromNBT(item.getTagCompound());
-            }
-            Render renderer = RenderManager.instance.getEntityRenderObject(luggage);
-            if (renderer.getFontRendererFromRenderManager() != null) {
-                renderer.doRender(luggage, 0, 0, 0, 0, 0.5f);
+                GL11.glTranslatef(0.5f, 0, 0.5f);
+                luggage.getInventory().clearAndSetSlotCount(27);
+                if (item.hasTagCompound()) {
+                    luggage.getInventory().readFromNBT(item.getTagCompound());
+                }
+                Render renderer = RenderManager.instance.getEntityRenderObject(luggage);
+                if (renderer.getFontRendererFromRenderManager() != null) {
+                    renderer.doRender(luggage, 0, 0, 0, 0, 0.5f);
+                }
+            } finally {
+                luggage.worldObj = null;
             }
             GL11.glPopMatrix();
             GL11.glEnable(GL11.GL_TEXTURE_2D);
diff --git a/src/main/java/openblocks/client/renderer/item/ItemRendererTank.java b/src/main/java/openblocks/client/renderer/item/ItemRendererTank.java
index 0ba7b7ec7..9105e5e7e 100644
--- a/src/main/java/openblocks/client/renderer/item/ItemRendererTank.java
+++ b/src/main/java/openblocks/client/renderer/item/ItemRendererTank.java
@@ -17,7 +17,7 @@
 
 public class ItemRendererTank implements IItemRenderer {
 
-    private FluidTank tank = new FluidTank(TileEntityTank.getTankCapacity());
+    private final FluidTank tank = new FluidTank(TileEntityTank.getTankCapacity());
 
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java
index f0082d00e..e2f080cbe 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java
@@ -12,7 +12,7 @@
 
 public class TileEntityAutoAnvilRenderer extends TileEntitySpecialRenderer {
 
-    private ModelAutoAnvil model = new ModelAutoAnvil();
+    private final ModelAutoAnvil model = new ModelAutoAnvil();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/autoanvil.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java
index e4392ef62..4535af005 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java
@@ -15,7 +15,7 @@ public class TileEntityAutoEnchantmentTableRenderer extends TileEntitySpecialRen
 
     private static final ResourceLocation enchantingTableBookTextures = new ResourceLocation(
             "textures/entity/enchanting_table_book.png");
-    private ModelBook enchantmentBook = new ModelBook();
+    private final ModelBook enchantmentBook = new ModelBook();
 
     @Override
     public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) {
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java
index 7d88d0154..fd31e83e8 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java
@@ -12,7 +12,7 @@
 
 public class TileEntityBearTrapRenderer extends TileEntitySpecialRenderer {
 
-    private ModelBearTrap model = new ModelBearTrap();
+    private final ModelBearTrap model = new ModelBearTrap();
 
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/beartrap.png");
 
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java
index d8e7c1b37..96a4f4d39 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java
@@ -16,7 +16,7 @@
 
 public class TileEntityCannonRenderer extends TileEntitySpecialRenderer {
 
-    private ModelCannon model = new ModelCannon();
+    private final ModelCannon model = new ModelCannon();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/cannon.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java
index 8dea86bcf..c2b10acc0 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java
@@ -12,7 +12,7 @@
 
 public class TileEntityDonationStationRenderer extends TileEntitySpecialRenderer {
 
-    private ModelPiggy model = new ModelPiggy();
+    private final ModelPiggy model = new ModelPiggy();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/piggy.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java
index fd849d5d0..0ed62ffef 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java
@@ -11,7 +11,7 @@
 
 public class TileEntityFanRenderer extends TileEntitySpecialRenderer {
 
-    private ModelFan model = new ModelFan();
+    private final ModelFan model = new ModelFan();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/fan.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java
index c7514bb8b..15978a844 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java
@@ -13,7 +13,7 @@
 
 public class TileEntityGraveRenderer extends TileEntitySpecialRenderer {
 
-    private ModelGrave model = new ModelGrave();
+    private final ModelGrave model = new ModelGrave();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/grave.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java
index ca42e37fd..fd7ea8afc 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java
@@ -21,7 +21,7 @@
 public class TileEntityPaintMixerRenderer extends TileEntitySpecialRenderer {
 
     RenderBlocks renderer = new RenderBlocks();
-    private ModelPaintMixer model = new ModelPaintMixer();
+    private final ModelPaintMixer model = new ModelPaintMixer();
     private static final ResourceLocation texture = new ResourceLocation(
             "openblocks",
             "textures/models/paintmixer.png");
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java
index 2bf84f441..2ceb8cb84 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java
@@ -20,7 +20,7 @@ public class TileEntityProjectorRenderer extends TileEntitySpecialRenderer {
     private final static ResourceLocation TEXTURE = new ResourceLocation("openblocks", "textures/models/projector.png");
     private static final float BLOCK_CENTRE_TRANSLATION = 0.5F;
 
-    private static ModelProjector model = new ModelProjector();
+    private static final ModelProjector model = new ModelProjector();
 
     @Override
     public void renderTileEntityAt(final TileEntity te, final double x, final double y, final double z,
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java
index 5748862a5..91d8e73b9 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java
@@ -12,7 +12,7 @@
 
 public class TileEntitySprinklerRenderer extends TileEntitySpecialRenderer {
 
-    private ModelSprinkler model = new ModelSprinkler();
+    private final ModelSprinkler model = new ModelSprinkler();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/sprinkler.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java
index 38c2045f2..6c57a8eda 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java
@@ -1,7 +1,6 @@
 package openblocks.client.renderer.tileentity;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -23,8 +22,6 @@
 
 public class TileEntityTankRenderer extends TileEntitySpecialRenderer {
 
-    RenderBlocks renderBlocks = new RenderBlocks();
-
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) {
         TileEntityTank tankTile = (TileEntityTank) te;
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java
index 247773e50..daa606ad9 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java
@@ -12,7 +12,7 @@
 
 public class TileEntityTargetRenderer extends TileEntitySpecialRenderer {
 
-    private ModelTarget model = new ModelTarget();
+    private final ModelTarget model = new ModelTarget();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/target.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java
index a6b02cc5e..05f119375 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java
@@ -11,7 +11,7 @@
 
 public class TileEntityVacuumHopperRenderer extends TileEntitySpecialRenderer {
 
-    private ModelVacuumHopper model = new ModelVacuumHopper();
+    private final ModelVacuumHopper model = new ModelVacuumHopper();
 
     private static final ResourceLocation texture = new ResourceLocation(
             "openblocks",
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java
index 7b06621fb..a43219a64 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java
@@ -16,7 +16,7 @@
 public class TileEntityVillageHighlighterRenderer extends TileEntitySpecialRenderer {
 
     private static final AxisAlignedBB BOUNDING_BOX = AxisAlignedBB.getBoundingBox(-8, -3, -8, 8, 3, 8);
-    private ModelVillage model = new ModelVillage();
+    private final ModelVillage model = new ModelVillage();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/village.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java
index cb8921b8e..25a05eedb 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java
@@ -12,7 +12,7 @@
 
 public class TileEntityXPShowerRenderer extends TileEntitySpecialRenderer {
 
-    private ModelXPShower model = new ModelXPShower();
+    private final ModelXPShower model = new ModelXPShower();
     private static final ResourceLocation texture = new ResourceLocation("openblocks", "textures/models/xpshower.png");
 
     @Override
diff --git a/src/main/java/openblocks/client/renderer/tileentity/guide/GuideLegacyRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/guide/GuideLegacyRenderer.java
index 393218965..b3222bf79 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/guide/GuideLegacyRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/guide/GuideLegacyRenderer.java
@@ -12,7 +12,7 @@
 
 public class GuideLegacyRenderer implements IGuideRenderer {
 
-    private DisplayListWrapper wrapper;
+    private final DisplayListWrapper wrapper;
 
     public GuideLegacyRenderer(final Runnable model) {
         wrapper = new DisplayListWrapper() {
diff --git a/src/main/java/openblocks/client/renderer/tileentity/guide/TileEntityBuilderGuideRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/guide/TileEntityBuilderGuideRenderer.java
index 0d3861cf0..7cd9df527 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/guide/TileEntityBuilderGuideRenderer.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/guide/TileEntityBuilderGuideRenderer.java
@@ -34,7 +34,7 @@ public class TileEntityBuilderGuideRenderer extends TileEntityGuideRenderer {
     private static final float OMEGA_32 = 0.0351f;
     private static final float DELTA_32 = 0.7635f;
 
-    private DisplayListWrapper cube = new DisplayListWrapper() {
+    private final DisplayListWrapper cube = new DisplayListWrapper() {
 
         @Override
         public void compile() {
diff --git a/src/main/java/openblocks/client/renderer/tileentity/tank/NeighbourMap.java b/src/main/java/openblocks/client/renderer/tileentity/tank/NeighbourMap.java
index 797497d35..cc1b50545 100644
--- a/src/main/java/openblocks/client/renderer/tileentity/tank/NeighbourMap.java
+++ b/src/main/java/openblocks/client/renderer/tileentity/tank/NeighbourMap.java
@@ -8,7 +8,7 @@
 
 public class NeighbourMap implements INeighbourMap {
 
-    private boolean[] neighbors = new boolean[64];
+    private final boolean[] neighbors = new boolean[64];
 
     public NeighbourMap(World world, int x, int y, int z, FluidStack fluid) {
         if (world == null) return;
diff --git a/src/main/java/openblocks/common/CraneRegistry.java b/src/main/java/openblocks/common/CraneRegistry.java
index 1c561660b..076ca8a83 100644
--- a/src/main/java/openblocks/common/CraneRegistry.java
+++ b/src/main/java/openblocks/common/CraneRegistry.java
@@ -39,8 +39,8 @@ public void updateLength() {
         }
     }
 
-    private Map<EntityPlayer, Data> itemData = new MapMaker().weakKeys().makeMap();
-    private Map<EntityPlayer, EntityMagnet> playersMagnets = new MapMaker().weakKeys().weakValues().makeMap();
+    private final Map<EntityPlayer, Data> itemData = new MapMaker().weakKeys().makeMap();
+    private final Map<EntityPlayer, EntityMagnet> playersMagnets = new MapMaker().weakKeys().weakValues().makeMap();
 
     public void ensureMagnetExists(EntityPlayer player) {
         EntityMagnet magnet = playersMagnets.get(player);
diff --git a/src/main/java/openblocks/common/DonationUrlManager.java b/src/main/java/openblocks/common/DonationUrlManager.java
index 81b4fac0a..f72b531ca 100644
--- a/src/main/java/openblocks/common/DonationUrlManager.java
+++ b/src/main/java/openblocks/common/DonationUrlManager.java
@@ -15,7 +15,7 @@ public static DonationUrlManager instance() {
         return instance;
     }
 
-    private HashMap<String, String> donationUrls = new HashMap<String, String>();
+    private final HashMap<String, String> donationUrls = new HashMap<String, String>();
 
     public DonationUrlManager() {
         addUrl(Mods.OPENBLOCKS, "https://www.patreon.com/openmods");
diff --git a/src/main/java/openblocks/common/MapDataManager.java b/src/main/java/openblocks/common/MapDataManager.java
index 3748bb694..9f26c48e7 100644
--- a/src/main/java/openblocks/common/MapDataManager.java
+++ b/src/main/java/openblocks/common/MapDataManager.java
@@ -98,7 +98,7 @@ protected void writeToStream(DataOutput output) throws IOException {
 
     private Set<Block> blockBlacklist;
 
-    private Set<Integer> mapsToUpdate = Sets.newHashSet();
+    private final Set<Integer> mapsToUpdate = Sets.newHashSet();
 
     public static int createNewMap(World world, byte scale) {
         int id = world.getUniqueDataId("height_map");
diff --git a/src/main/java/openblocks/common/Stencil.java b/src/main/java/openblocks/common/Stencil.java
index 630a438c9..c677c8463 100644
--- a/src/main/java/openblocks/common/Stencil.java
+++ b/src/main/java/openblocks/common/Stencil.java
@@ -26,7 +26,7 @@ public enum Stencil {
 
     private IIcon blockIcon;
     private IIcon coverBlockIcon;
-    private String iconName;
+    private final String iconName;
 
     Stencil(String iconName) {
         this.iconName = iconName;
diff --git a/src/main/java/openblocks/common/block/BlockGuide.java b/src/main/java/openblocks/common/block/BlockGuide.java
index ad3d85fe9..40b97113c 100644
--- a/src/main/java/openblocks/common/block/BlockGuide.java
+++ b/src/main/java/openblocks/common/block/BlockGuide.java
@@ -35,7 +35,7 @@ public class BlockGuide extends OpenBlock implements ISelectionAware {
 
     private AxisAlignedBB selection;
 
-    private static double P = 1.0 / 16.0;
+    private static final double P = 1.0 / 16.0;
 
     private static final double SELECTION_BOX_DEPTH = 0.01;
 
@@ -172,7 +172,7 @@ public boolean activate(TileEntityGuide te, EntityPlayerMP player) {
                 subBoxes);
     }
 
-    private BoundingBoxMap<BoundingBoxMap<IShapeManipulator>> buttons = BoundingBoxMap.create();
+    private final BoundingBoxMap<BoundingBoxMap<IShapeManipulator>> buttons = BoundingBoxMap.create();
     {
         createTopBottomSide(buttons, ForgeDirection.UP);
         createNSWESide(buttons, ForgeDirection.NORTH);
diff --git a/src/main/java/openblocks/common/container/ContainerDevNull.java b/src/main/java/openblocks/common/container/ContainerDevNull.java
index 0513032c6..9660ae8fe 100644
--- a/src/main/java/openblocks/common/container/ContainerDevNull.java
+++ b/src/main/java/openblocks/common/container/ContainerDevNull.java
@@ -10,7 +10,7 @@
 
 public class ContainerDevNull extends ContainerBase<Void> {
 
-    private InventoryPlayer playerInventory;
+    private final InventoryPlayer playerInventory;
 
     private final int protectedSlot;
 
diff --git a/src/main/java/openblocks/common/entity/EntityCartographer.java b/src/main/java/openblocks/common/entity/EntityCartographer.java
index 1ee766162..6cc473584 100644
--- a/src/main/java/openblocks/common/entity/EntityCartographer.java
+++ b/src/main/java/openblocks/common/entity/EntityCartographer.java
@@ -51,7 +51,7 @@ public class EntityCartographer extends EntityAssistant implements ISelectAware,
 
     public static class MapJobs extends SyncableObjectBase {
 
-        private BitSet bits = new BitSet();
+        private final BitSet bits = new BitSet();
         private Set<ChunkJob> jobs;
         private int size;
 
diff --git a/src/main/java/openblocks/common/entity/EntityHangGlider.java b/src/main/java/openblocks/common/entity/EntityHangGlider.java
index 4a8c96d58..dc7ff41ec 100644
--- a/src/main/java/openblocks/common/entity/EntityHangGlider.java
+++ b/src/main/java/openblocks/common/entity/EntityHangGlider.java
@@ -51,7 +51,7 @@ public class EntityHangGlider extends Entity implements IEntityAdditionalSpawnDa
 
     private static final boolean isBackhandLoaded = Loader.isModLoaded("backhand");
 
-    private static Map<EntityPlayer, EntityHangGlider> gliderMap = new HashMap<>();
+    private static final Map<EntityPlayer, EntityHangGlider> gliderMap = new HashMap<>();
 
     private IVarioController varioControl = IVarioController.NULL;
 
@@ -103,7 +103,7 @@ public static void updateGliders(World worldObj) {
     }
 
     private EntityPlayer player;
-    private NoiseGeneratorPerlin noiseGen;
+    private final NoiseGeneratorPerlin noiseGen;
     private int ticksSinceLastVarioUpdate = 0;
     private double verticalMotionSinceLastVarioUpdate = 0;
     private double lastMotionY = 0;
diff --git a/src/main/java/openblocks/common/entity/EntityMagnet.java b/src/main/java/openblocks/common/entity/EntityMagnet.java
index 60264c3bf..b53da89c3 100644
--- a/src/main/java/openblocks/common/entity/EntityMagnet.java
+++ b/src/main/java/openblocks/common/entity/EntityMagnet.java
@@ -50,7 +50,7 @@ public interface IOwner {
 
     private static class EntityPlayerTarget implements IOwner {
 
-        private WeakReference<EntityPlayer> owner;
+        private final WeakReference<EntityPlayer> owner;
 
         public EntityPlayerTarget(EntityPlayer owner) {
             this.owner = new WeakReference<EntityPlayer>(owner);
diff --git a/src/main/java/openblocks/common/entity/ai/EntityAIBreakBlock.java b/src/main/java/openblocks/common/entity/ai/EntityAIBreakBlock.java
index c71d2d0b0..307571cfe 100644
--- a/src/main/java/openblocks/common/entity/ai/EntityAIBreakBlock.java
+++ b/src/main/java/openblocks/common/entity/ai/EntityAIBreakBlock.java
@@ -22,11 +22,11 @@
 
 public class EntityAIBreakBlock extends EntityAIBase {
 
-    private EntityLiving entity;
-    private PathNavigate pathFinder;
+    private final EntityLiving entity;
+    private final PathNavigate pathFinder;
     private Coord blockCoord;
     private int tickOffset = 0;
-    private Random rand;
+    private final Random rand;
 
     public EntityAIBreakBlock(EntityLiving minime) {
         this.entity = minime;
diff --git a/src/main/java/openblocks/common/entity/ai/EntityAICollectItem.java b/src/main/java/openblocks/common/entity/ai/EntityAICollectItem.java
index 48082faa1..9fc31b84c 100644
--- a/src/main/java/openblocks/common/entity/ai/EntityAICollectItem.java
+++ b/src/main/java/openblocks/common/entity/ai/EntityAICollectItem.java
@@ -16,7 +16,7 @@ public class EntityAICollectItem extends EntityAIBase {
 
     private EntityLuggage luggage = null;
 
-    private PathNavigate pathFinder;
+    private final PathNavigate pathFinder;
 
     private EntityItem targetItem = null;
 
diff --git a/src/main/java/openblocks/common/entity/ai/EntityAIPickupPlayer.java b/src/main/java/openblocks/common/entity/ai/EntityAIPickupPlayer.java
index 71bdbb262..9b4c2e0a9 100644
--- a/src/main/java/openblocks/common/entity/ai/EntityAIPickupPlayer.java
+++ b/src/main/java/openblocks/common/entity/ai/EntityAIPickupPlayer.java
@@ -14,8 +14,8 @@
 
 public class EntityAIPickupPlayer extends EntityAIBase {
 
-    private EntityMiniMe minime;
-    private PathNavigate pathFinder;
+    private final EntityMiniMe minime;
+    private final PathNavigate pathFinder;
     private EntityPlayer targetPlayer;
 
     public EntityAIPickupPlayer(EntityMiniMe entity) {
diff --git a/src/main/java/openblocks/common/item/ItemHangGlider.java b/src/main/java/openblocks/common/item/ItemHangGlider.java
index 025e8c9bd..8d673faf2 100644
--- a/src/main/java/openblocks/common/item/ItemHangGlider.java
+++ b/src/main/java/openblocks/common/item/ItemHangGlider.java
@@ -17,7 +17,7 @@
 @BookDocumentation(hasVideo = true)
 public class ItemHangGlider extends Item {
 
-    private static HashSet<Integer> blacklistedDimensions = new HashSet<>();
+    private static final HashSet<Integer> blacklistedDimensions = new HashSet<>();
 
     public ItemHangGlider() {
         setCreativeTab(OpenBlocks.tabOpenBlocks);
diff --git a/src/main/java/openblocks/common/item/ItemPedometer.java b/src/main/java/openblocks/common/item/ItemPedometer.java
index 8652a42dc..a5a0f45b5 100644
--- a/src/main/java/openblocks/common/item/ItemPedometer.java
+++ b/src/main/java/openblocks/common/item/ItemPedometer.java
@@ -41,8 +41,8 @@ private static void send(EntityPlayer player, String format, Object... args) {
         player.addChatComponentMessage(new ChatComponentTranslation(format, args));
     }
 
-    private SpeedUnit speedUnit = SpeedUnit.M_PER_TICK;
-    private DistanceUnit distanceUnit = DistanceUnit.M;
+    private final SpeedUnit speedUnit = SpeedUnit.M_PER_TICK;
+    private final DistanceUnit distanceUnit = DistanceUnit.M;
 
     @Override
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
diff --git a/src/main/java/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java b/src/main/java/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java
index 2365c3d10..3ff039ded 100644
--- a/src/main/java/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java
+++ b/src/main/java/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java
@@ -99,7 +99,7 @@ public boolean isItemValidForSlot(int i, ItemStack itemstack) {
     public float bookRotation2;
     public float bookRotationPrev;
     public float bookRotation;
-    private static Random rand = new Random();
+    private static final Random rand = new Random();
 
     public TileEntityAutoEnchantmentTable() {
         slotSides.registerSlot(Slots.input, inputSides, true, false);
diff --git a/src/main/java/openblocks/common/tileentity/TileEntityGoldenEgg.java b/src/main/java/openblocks/common/tileentity/TileEntityGoldenEgg.java
index ff05cdb6b..6ff9eba26 100644
--- a/src/main/java/openblocks/common/tileentity/TileEntityGoldenEgg.java
+++ b/src/main/java/openblocks/common/tileentity/TileEntityGoldenEgg.java
@@ -178,7 +178,7 @@ private State(float rotationSpeed, float riseSpeed, boolean specialEffects) {
     private float rotationSpeed;
     private float progressSpeed;
 
-    private List<EntityBlock> blocks = Lists.newArrayList();
+    private final List<EntityBlock> blocks = Lists.newArrayList();
     private SyncableEnum<State> stage;
 
     private GameProfile owner;
diff --git a/src/main/java/openblocks/common/tileentity/TileEntityItemDropper.java b/src/main/java/openblocks/common/tileentity/TileEntityItemDropper.java
index 529709d8d..6958335c4 100644
--- a/src/main/java/openblocks/common/tileentity/TileEntityItemDropper.java
+++ b/src/main/java/openblocks/common/tileentity/TileEntityItemDropper.java
@@ -28,7 +28,7 @@ public class TileEntityItemDropper extends OpenTileEntity implements INeighbourA
 
     private boolean _redstoneSignal;
 
-    private GenericInventory inventory = registerInventoryCallback(
+    private final GenericInventory inventory = registerInventoryCallback(
             new TileEntityInventory(this, "itemDropper", false, 9));
 
     public TileEntityItemDropper() {}
diff --git a/src/main/java/openblocks/common/tileentity/TileEntityPaintMixer.java b/src/main/java/openblocks/common/tileentity/TileEntityPaintMixer.java
index dd2a114c7..4dad6c98f 100644
--- a/src/main/java/openblocks/common/tileentity/TileEntityPaintMixer.java
+++ b/src/main/java/openblocks/common/tileentity/TileEntityPaintMixer.java
@@ -57,7 +57,7 @@ public static enum DyeSlot {
         black
     }
 
-    private static EnumMap<Slots, Integer> ALLOWED_COLORS = Maps.newEnumMap(Slots.class);
+    private static final EnumMap<Slots, Integer> ALLOWED_COLORS = Maps.newEnumMap(Slots.class);
 
     static {
         ALLOWED_COLORS.put(Slots.dyeBlack, OreDictionary.getOreID("dyeBlack"));
@@ -95,7 +95,7 @@ public enum Flags {
     @StoreOnDrop
     public SyncableFloat lvlBlack;
 
-    private GenericInventory inventory = new TileEntityInventory(this, "paintmixer", true, 6) {
+    private final GenericInventory inventory = new TileEntityInventory(this, "paintmixer", true, 6) {
 
         @Override
         public boolean isItemValidForSlot(int slotId, ItemStack stack) {
diff --git a/src/main/java/openblocks/common/tileentity/TileEntityXPShower.java b/src/main/java/openblocks/common/tileentity/TileEntityXPShower.java
index 6d5afe656..cdcad45ab 100644
--- a/src/main/java/openblocks/common/tileentity/TileEntityXPShower.java
+++ b/src/main/java/openblocks/common/tileentity/TileEntityXPShower.java
@@ -20,7 +20,9 @@ public class TileEntityXPShower extends SyncedTileEntity implements INeighbourAw
 
     private static final int DRAIN_PER_CYCLE = 50;
 
-    private GenericTank bufferTank = new GenericTank(FluidContainerRegistry.BUCKET_VOLUME, OpenBlocks.Fluids.xpJuice);
+    private final GenericTank bufferTank = new GenericTank(
+            FluidContainerRegistry.BUCKET_VOLUME,
+            OpenBlocks.Fluids.xpJuice);
 
     private SyncableBoolean isOn;
     private SyncableBoolean particleSpawnerActive;
diff --git a/src/main/java/openblocks/enchantments/ExplosiveEnchantmentsHandler.java b/src/main/java/openblocks/enchantments/ExplosiveEnchantmentsHandler.java
index 700658102..1569c207b 100644
--- a/src/main/java/openblocks/enchantments/ExplosiveEnchantmentsHandler.java
+++ b/src/main/java/openblocks/enchantments/ExplosiveEnchantmentsHandler.java
@@ -109,7 +109,7 @@ public static void createExplosionForEntity(Entity entity, float power, boolean
         }
     }
 
-    private Map<Entity, JumpInfo> jumpBoosts = new MapMaker().weakKeys().makeMap();
+    private final Map<Entity, JumpInfo> jumpBoosts = new MapMaker().weakKeys().makeMap();
 
     private static final ItemStack gunpowder = new ItemStack(Items.gunpowder);