Fix issues with a clean start.