Fixes to rollout handler