Fixing some restart bugs