Initial Minecraft 1.6.X Fixes