diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index 4c2da71ad..dcb2650bc 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -246,7 +246,7 @@ public final class ApiBlocks implements IBlocks
 	{
 //		if(this.registeredClasses.contains( teClass ) )
 //		{
-//			AELog.debug( "Already registered " + teClass.getName() +" to Forge!" );
+//			AELog.debug( "Already registered " + teClass.getName() + " to Forge!" );
 //			return;
 //		}
 //
diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java
index b14c8ac77..508f36198 100644
--- a/src/main/java/appeng/items/materials/ItemMaterial.java
+++ b/src/main/java/appeng/items/materials/ItemMaterial.java
@@ -38,9 +38,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -209,19 +207,19 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 		{
 			if( mt.getOreName() != null )
 			{
-				ItemStack replacement = null;
+				ItemStack replacement = ItemStack.EMPTY;
 
 				final String[] names = mt.getOreName().split( "," );
 
 				for( final String name : names )
 				{
-					if( replacement != null )
+					if( !replacement.isEmpty() )
 					{
 						break;
 					}
 
 					final List<ItemStack> options = OreDictionary.getOres( name );
-					if( options != null && options.size() > 0 )
+					if( options != OreDictionary.EMPTY_LIST && options.size() > 0 )
 					{
 						for( final ItemStack is : options )
 						{
@@ -234,7 +232,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 					}
 				}
 
-				if( replacement == null || AEConfig.instance().useAEVersion( mt ) )
+				if( replacement.isEmpty() || AEConfig.instance().useAEVersion( mt ) )
 				{
 					// continue using the AE2 item.
 					for( final String name : names )
diff --git a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java
index facb2c064..74e552695 100644
--- a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java
+++ b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java
@@ -40,7 +40,7 @@ import appeng.worldgen.meteorite.ChunkOnly;
 public final class MeteoriteWorldGen implements IWorldGenerator
 {
 	@Override
-	public void generate(final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
+	public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
 	{
 		if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.METEORITES, w ) )
 		{
diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java
index 38ed2d515..0c380d48b 100644
--- a/src/main/java/appeng/worldgen/QuartzWorldGen.java
+++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java
@@ -56,7 +56,7 @@ public final class QuartzWorldGen implements IWorldGenerator
 	}
 
 	@Override
-	public void generate(final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
+    public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
 	{
 		int seaLevel = w.provider.getAverageGroundLevel() + 1;