6.0 Hotfixes

- lol