diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
index 4acc15f3ea..e216b68ba8 100644
--- a/resources/content_server/browse/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -58,7 +58,7 @@
                     <input type="hidden" name="cmd" value="_s-xclick"></input>
                     <input type="hidden" name="hosted_button_id" value="3028915"></input>
                     <input type="image"
-                        src="http://calibre-ebook.com/site_media//img/button-donate.png"
+                        src="/static/button-donate.png"
                         name="submit"></input>
                     <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
                         width="1" height="1"></img>
diff --git a/resources/content_server/button-donate.png b/resources/content_server/button-donate.png
new file mode 100644
index 0000000000..25ccf3f514
Binary files /dev/null and b/resources/content_server/button-donate.png differ
diff --git a/src/calibre/ebooks/metadata/amazon.py b/src/calibre/ebooks/metadata/amazon.py
index 1713d044f5..f5586c8396 100644
--- a/src/calibre/ebooks/metadata/amazon.py
+++ b/src/calibre/ebooks/metadata/amazon.py
@@ -37,6 +37,7 @@ def get_social_metadata(title, authors, publisher, isbn):
     if isbn:
         br = browser()
         response_xml = br.open('http://status.calibre-ebook.com/aws/metadata/'+isbn).read()
+        print 1111111, response_xml
         root = etree.fromstring(response_xml)
         try:
             check_for_errors(root, isbn)
@@ -63,6 +64,8 @@ def get_social_metadata(title, authors, publisher, isbn):
             if num_of_reviews > 4 and rating > 0 and rating < 5:
                 mi.rating = rating
         except:
+            import traceback
+            traceback.print_exc()
             pass
         tags = [x.text for x in root.findall('.//%s/%s'%(AWS('Subjects'),
             AWS('Subject')))]
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index ae740947b7..687c8480be 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -463,5 +463,7 @@ Finally, you can add downloaded news to the |app| library with::
 
    /opt/calibre/calibredb add --with-library /path/to/library outfile.epub
 
-Remember to read the command line documentatation section of the |app| User Manual to learn more about these, and other commands.
+Remember to read the command line documentation section of the |app| User Manual to learn more about these, and other commands.
+
+.. note:: Some parts of calibre require a X server. If you're lucky, nothing you do will fall into this category, if not, you will have to look into using xvfb.