More hotfixes tonight