Misc cleanup; take more shots at the start.