Rollout Bug Fixes

**Ready to merge**