More bug fixes in rollout code.