diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ac47934d16..049abb2d50 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1921,7 +1921,7 @@ Application::Application(
 
     if (parser->isSet("scripts")) {
         _defaultScriptsLocation.setPath(parser->value("scripts")); // Might need to be done in "main.cpp".
-	_overrideDefaultScriptsLocation = true;
+        _overrideDefaultScriptsLocation = true;
     } else {
 	_overrideDefaultScriptsLocation = false;
     }
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 78b12993b3..5c7ba837f4 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -93,7 +93,8 @@ int main(int argc, const char* argv[]) {
     );
     QCommandLineOption listenPortOption(
         "listenPort",
-        "Port to listen on."
+        "Port to listen on.",
+        "port_number"
     );
     QCommandLineOption serverContentPathOption(
         "serverContentPath",
@@ -151,15 +152,18 @@ int main(int argc, const char* argv[]) {
     );
     QCommandLineOption concurrentDownloadsOption(
         "concurrent-downloads",
-        "Maximum concurrent resource downloads. Default is 16, except for Android where it is 4."
+        "Maximum concurrent resource downloads. Default is 16, except for Android where it is 4.",
+        "integer"
     );
     QCommandLineOption avatarURLOption(
         "avatarURL",
-        "Override the avatar U.R.L."
+        "Override the avatar U.R.L.",
+        "url"
     );
     QCommandLineOption replaceAvatarURLOption(
         "replace-avatar-url",
-        "Replaces the avatar U.R.L. When used with --avatarURL, this takes precedence."
+        "Replaces the avatar U.R.L. When used with --avatarURL, this takes precedence.",
+        "url"
     );
     QCommandLineOption setBookmarkOption(
         "setBookmark",