fix some rollout related bugs