More Hotfixes