Another Round of Hotfixes