Fixed #1 and pulled in some changes from 1.7

Unfortunately doesn't work when a Forge client w/o mod connects to a
server w/ mod.