diff --git a/setup/server.py b/setup/server.py
index 0fea4ec733..5fabd17108 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -89,7 +89,7 @@ class Server(Command):
             t = telnetlib.Telnet('localhost', 4242)
             t.read_until("repl>")
             t.write('BrowserReload();')
-            print t.read_until("repl>")
+            t.read_until("repl>")
             t.close()
         except:
             print 'Failed to reload browser'
diff --git a/src/calibre/ebooks/metadata/amazon.py b/src/calibre/ebooks/metadata/amazon.py
index 1ee77fec39..cf96c9732c 100644
--- a/src/calibre/ebooks/metadata/amazon.py
+++ b/src/calibre/ebooks/metadata/amazon.py
@@ -112,13 +112,12 @@ def get_metadata(br, asin, mi):
 
 def main(args=sys.argv):
     # Test xisbn
-    #print get_social_metadata('Learning Python', None, None, '8324616489')
-    #print
+    print get_social_metadata('Learning Python', None, None, '8324616489')
+    print
 
     # Test sophisticated comment formatting
     print get_social_metadata('Angels & Demons', None, None, '9781416580829')
     print
-    return
 
     # Random tests
     print get_social_metadata('Star Trek: Destiny: Mere Mortals', None, None, '9781416551720')
diff --git a/src/calibre/library/server/content.py b/src/calibre/library/server/content.py
index 6437f02cb6..5492c86fa9 100644
--- a/src/calibre/library/server/content.py
+++ b/src/calibre/library/server/content.py
@@ -128,7 +128,7 @@ class ContentServer(object):
         if want_mobile:
             return self.mobile()
 
-        return self.browse_toplevel()
+        return self.browse_catalog()
 
     def old(self, **kwargs):
         return self.static('index.html').replace('{prefix}',