Fixed some restart glitches