More hotfixes.