diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py
index bd73c47ae2..e618a62432 100644
--- a/synapse/app/admin_cmd.py
+++ b/synapse/app/admin_cmd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2019 Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ def start(config_options):
 
     subparser = parser.add_subparsers(
         title="Admin Commands",
-        description="Choose and admin command to perform.",
+        description="Choose an admin command to perform.",
         required=True,
         dest="command",
         metavar="<admin_command>",
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index e588f82981..74a7980ebe 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -284,7 +284,7 @@ class Config(object):
         Used for workers where we want to add extra flags/subcommands.
 
         Args:
-            conifg_parser (ArgumentParser)
+            config_parser (ArgumentParser)
             argv (list[str])
 
         Returns: