Misc cleanup
[BLEEDING] Support MC 1.7.6 AND 1.8.x