Bugfixes

Misc bugfixes, would become 1.12.5