diff --git a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java
index d302c8e2c..e8ebfcd2c 100644
--- a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java
+++ b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java
@@ -12,6 +12,7 @@ package forestry.arboriculture.gadgets;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import net.minecraft.block.BlockNewLeaf;
 import net.minecraft.block.ITileEntityProvider;
@@ -80,6 +81,7 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv
 
 	@SideOnly(Side.CLIENT)
 	@Override
+	@SuppressWarnings({"unchecked","rawtypes"})
 	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
 
 		for (ITree tree : PluginArboriculture.treeInterface.getIndividualTemplates()) {
@@ -185,6 +187,13 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv
 		super.beginLeavesDecay(world, x, y, z);
 	}
 
+	@Override
+	public void updateTick(World world, int x, int y, int z, Random random) {
+		if (getLeafTile(world, x, y, z).isDecorative())
+			return;
+		super.updateTick(world, x, y, z, random);
+	}
+
 	/* RENDERING */
 	@Override
 	public boolean isOpaqueCube() {
diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java
index d4b2cbd52..a61b5d9ab 100755
--- a/src/main/java/forestry/plugins/PluginStorage.java
+++ b/src/main/java/forestry/plugins/PluginStorage.java
@@ -89,6 +89,7 @@ public class PluginStorage extends ForestryPlugin implements IOreDictionaryHandl
 	Configuration config;
 
 	@Override
+	@SuppressWarnings({"unchecked","rawtypes"})
 	public void preInit() {
 		BackpackManager.backpackInterface = new BackpackHelper();