Hotfixes

Launching these in production