Fix up combinations of --wait and --no-run