Updates for MoP

Seems someone else has fixed stuff for MoP. Pull this into UltimateFishbot and then I can branch from that to fix stuff for WoD.