Production hotfixes