Fix errors on 1.6.4/ Latest 1.6.2 Forge
Merge pull request #1 from mattparks/master

Fix errors on 1.6.4/ Latest 1.6.2 Forge