Updates and bugfixes for MC 1.7+