Update for MC v1.6.4
Other minor fixes