6.0 Hotfixes

- Something something something are we there yet?