Bulletproofing

Better bulletproofing of the civilian round-start fix