Fix everything and rollout hotfix