diff --git a/python/fedml/api/modules/device.py b/python/fedml/api/modules/device.py
index 9f39419a7..27b2d0d19 100644
--- a/python/fedml/api/modules/device.py
+++ b/python/fedml/api/modules/device.py
@@ -183,7 +183,7 @@ def _bind(
                 "-pph",
                 str(price_per_hour),
                 "-n",
-                name
+                str(name)
             ]
         ).pid
         sys_utils.save_login_process(ClientConstants.LOCAL_HOME_RUNNER_DIR_NAME,
diff --git a/python/fedml/computing/scheduler/slave/client_daemon.py b/python/fedml/computing/scheduler/slave/client_daemon.py
index a82c446c0..a3dff06e2 100755
--- a/python/fedml/computing/scheduler/slave/client_daemon.py
+++ b/python/fedml/computing/scheduler/slave/client_daemon.py
@@ -6,8 +6,7 @@
 
 import fedml
 from fedml.computing.scheduler.comm_utils.sys_utils import cleanup_all_fedml_client_api_processes, \
-    cleanup_all_fedml_client_learning_processes, cleanup_all_fedml_client_login_processes, get_python_program, \
-    daemon_ota_upgrade
+    cleanup_all_fedml_client_learning_processes, cleanup_all_fedml_client_login_processes, get_python_program
 from fedml.computing.scheduler.scheduler_core.general_constants import MarketplaceType
 from fedml.computing.scheduler.slave.client_constants import ClientConstants
 from fedml.computing.scheduler.comm_utils.run_process_utils import RunProcessUtils
@@ -27,7 +26,7 @@
     parser.add_argument("--local_on_premise_platform_port", "-lpp", type=int, default=80)
     parser.add_argument("--marketplace_type", "-mpt", type=str, default=MarketplaceType.SECURE.name)
     parser.add_argument("--price_per_hour", "-pph", type=str, default="0.0")
-    parser.add_argument("--name", "-n", type=str, default="")
+    parser.add_argument("--name", "-n", type=str, nargs='?', default="")
 
     args = parser.parse_args()
     args.user = args.user
diff --git a/python/fedml/computing/scheduler/slave/client_login.py b/python/fedml/computing/scheduler/slave/client_login.py
index c830f9e8c..6d8b9d1ae 100755
--- a/python/fedml/computing/scheduler/slave/client_login.py
+++ b/python/fedml/computing/scheduler/slave/client_login.py
@@ -27,7 +27,7 @@ def logout():
     parser.add_argument("--local_on_premise_platform_port", "-lpp", type=int, default=80)
     parser.add_argument("--marketplace_type", "-mpt", type=str, default=MarketplaceType.SECURE.name)
     parser.add_argument("--price_per_hour", "-pph", type=str, default="0.0")
-    parser.add_argument("--name", "-n", type=str, default="")
+    parser.add_argument("--name", "-n", type=str, nargs='?', default="")
 
     args = parser.parse_args()
     args.user = args.user