diff --git a/clearml_agent/backend_api/config/default/agent.conf b/clearml_agent/backend_api/config/default/agent.conf
index 6af24de..0de3472 100644
--- a/clearml_agent/backend_api/config/default/agent.conf
+++ b/clearml_agent/backend_api/config/default/agent.conf
@@ -217,8 +217,8 @@
     }
 
     # Name docker containers created by the daemon using the following string format (supported from Docker 0.6.5)
-    # Allowed variables are task_id, worker_id and rand_string (random lower-case letters string, up to 32 charaters)
-    # Note: resulting name must start with an alpha-numeric character and continue with a alpha-numeric characters,
+    # Allowed variables are task_id, worker_id and rand_string (random lower-case letters string, up to 32 characters)
+    # Note: resulting name must start with an alphanumeric character and continue with alphanumeric characters,
     #  underscores (_), dots (.) and/or dashes (-)
     #docker_container_name_format: "clearml-id-{task_id}-{rand_string:.8}"
 }
diff --git a/clearml_agent/commands/worker.py b/clearml_agent/commands/worker.py
index 2981e8f..07d4daa 100644
--- a/clearml_agent/commands/worker.py
+++ b/clearml_agent/commands/worker.py
@@ -1434,7 +1434,7 @@ class Worker(ServiceCommandSection):
 
         queue_names = [q.name for q in queues]
         if not all('=' in q for q in queue_names):
-            raise ValueError("using --dynamic-gpus, --queues [{}], "
+            raise ValueError("using --dynamic-gpus, --queue [{}], "
                              "queue must be in format <queue_name>=<num_gpus>".format(queue_names))
 
         gpu_indexes = kwargs.get('gpus')
diff --git a/clearml_agent/interface/worker.py b/clearml_agent/interface/worker.py
index 684b302..1460eb7 100644
--- a/clearml_agent/interface/worker.py
+++ b/clearml_agent/interface/worker.py
@@ -104,7 +104,7 @@ DAEMON_ARGS = dict({
     },
     '--dynamic-gpus': {
         'help': 'Allow to dynamically allocate gpus based on queue properties, '
-                'configure with \'--queues <queue_name>=<num_gpus>\'.'
+                'configure with \'--queue <queue_name>=<num_gpus>\'.'
                 ' Example: \'--dynamic-gpus --gpus 0-3 --queue dual_gpus=2 single_gpu=1\''
                 ' Example Opportunistic: \'--dynamic-gpus --gpus 0-3 --queue dual_gpus=2 max_quad_gpus=1-4 \'',
         'action': 'store_true',
diff --git a/docs/clearml.conf b/docs/clearml.conf
index a98c8f1..7444b3a 100644
--- a/docs/clearml.conf
+++ b/docs/clearml.conf
@@ -195,9 +195,9 @@ agent {
     # }
 
     # Name docker containers created by the daemon using the following string format (supported from Docker 0.6.5)
-    # Allowed variables are task_id, worker_id and rand_string (random lower-case letters string, up to 32 charaters)
-    # Note: resulting name must start with an alpha-numeric character and
-    #       continue with a alpha-numeric characters, underscores (_), dots (.) and/or dashes (-)
+    # Allowed variables are task_id, worker_id and rand_string (random lower-case letters string, up to 32 characters)
+    # Note: resulting name must start with an alphanumeric character and
+    #       continue with alphanumeric characters, underscores (_), dots (.) and/or dashes (-)
     # docker_container_name_format: "clearml-id-{task_id}-{rand_string:.8}"
 }