More hotfixes to production