A couple of fixups for S/R crashes and misbehaviour.