[WIP] Hotfixes