diff --git a/pypiserver/__main__.py b/pypiserver/__main__.py
index ce66f16..491bafe 100644
--- a/pypiserver/__main__.py
+++ b/pypiserver/__main__.py
@@ -157,9 +157,9 @@ def main(argv=None):
 
     c = pypiserver.Configuration(**pypiserver.default_config())
 
-    update_dry_run = True,
-    update_directory = None,
-    update_stable_only = True,
+    update_dry_run = True
+    update_directory = None
+    update_stable_only = True
 
     try:
         opts, roots = getopt.getopt(argv[1:], "i:p:a:r:d:P:Uuvxoh", [
diff --git a/pypiserver/manage.py b/pypiserver/manage.py
index 2ae7504..f788fd8 100644
--- a/pypiserver/manage.py
+++ b/pypiserver/manage.py
@@ -12,6 +12,7 @@ if sys.version_info >= (3, 0):
         return Server(url)
 else:
     from xmlrpclib import Transport  # @UnresolvedImport
+    from xmlrpclib import ServerProxy
     import httplib  # @UnresolvedImport
     import urllib
 
@@ -45,7 +46,7 @@ else:
             transport.set_proxy(http_proxy_spec)
         else:
             transport = None
-        return Server(url, transport=transport)
+        return ServerProxy(url, transport=transport)
 
 
 def is_stable_version(pversion):