More hotfixes