more emergency hotfixes