Add --no-startup-id where needed.