diff --git a/deluge/ui/console/commands/debug.py b/deluge/ui/console/commands/debug.py
index 118f9542b..40e87eda2 100644
--- a/deluge/ui/console/commands/debug.py
+++ b/deluge/ui/console/commands/debug.py
@@ -44,7 +44,7 @@ import deluge.component as component
 
 class Command(BaseCommand):
     """Enable and disable debugging"""
-    usage = 'debug [on|off]'
+    usage = 'Usage: debug [on|off]'
     def handle(self, state='', **options):
         if state == 'on':
             deluge.log.setLoggerLevel("debug")
diff --git a/deluge/ui/console/commands/halt.py b/deluge/ui/console/commands/halt.py
index 0a4de27a9..1c239dec4 100644
--- a/deluge/ui/console/commands/halt.py
+++ b/deluge/ui/console/commands/halt.py
@@ -39,7 +39,8 @@ from deluge.ui.client import client
 import deluge.component as component
 
 class Command(BaseCommand):
-    "Shutdown the deluge server."
+    "Shutdown the deluge server"
+    usage = "Usage: halt"
     def handle(self, **options):
         self.console = component.get("ConsoleUI")
 
diff --git a/deluge/ui/console/commands/quit.py b/deluge/ui/console/commands/quit.py
index f0e2fae22..1c95f9461 100644
--- a/deluge/ui/console/commands/quit.py
+++ b/deluge/ui/console/commands/quit.py
@@ -40,6 +40,7 @@ from twisted.internet import reactor
 class Command(BaseCommand):
     """Exit from the client."""
     aliases = ['exit']
+    interactive_only = True
     def handle(self, *args, **options):
         if client.connected():
             def on_disconnect(result):