Hotfixes and moar