more prod hotfixes