Rollout Bug Fixes

**Not ready to merge**