diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index c020fcda7..1c64313a9 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -106,7 +106,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd = null, o
               removeProgressBar()
               return
           }
-          if (elapsedFromStart > 3 && !res.queued && res.progress == prevProgress) {
+          if (elapsedFromStart > 10 && !res.queued && res.progress == prevProgress) {
                 removeProgressBar()
                 return
             }
diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index c85b8e3d4..55167d004 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -63,6 +63,7 @@ def compatibility_args(opts, args):
     parser.add_argument("--clip-models-path", type=str, help=argparse.SUPPRESS, default=opts.clip_models_path)
     parser.add_argument("--disable-nan-check", default = True, action='store_true', help=argparse.SUPPRESS)
     parser.add_argument("--disable-extension-access", default = False, action='store_true', help=argparse.SUPPRESS)
+    parser.add_argument("--opt-channelslast", help=argparse.SUPPRESS, default=opts.opt_channelslast)
     parser.add_argument("--xformers", default = (opts.cross_attention_optimization == "xFormers"), action='store_true', help=argparse.SUPPRESS)
     args = parser.parse_args()
     if vars(parser)['_option_string_actions'].get('--lora-dir', None) is not None:
diff --git a/setup.py b/setup.py
index afa3420c5..252f514d5 100644
--- a/setup.py
+++ b/setup.py
@@ -171,7 +171,8 @@ def check_python():
 # check torch version
 def check_torch():
     torch_command = os.environ.get('TORCH_COMMAND', 'torch torchaudio torchvision --index-url https://download.pytorch.org/whl/cu118')
-    install(torch_command)
+    if 'torch' in torch_command:
+        install(torch_command)
     try:
         import torch
         log.info(f'Torch {torch.__version__}')
@@ -205,7 +206,8 @@ def install_packages():
     install(clip_package, 'clip')
     try:
         xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17')
-        install(f'--no-deps {xformers_package}', ignore=True)
+        if 'xformers' in xformers_package:
+            install(f'--no-deps {xformers_package}', ignore=True)
     except Exception as e:
         log.debug(f'Cannot install xformers package: {e}')