Make the restarter a bit more reliable