More hotfixes...