diff --git a/resources/recipes/biggovernment.recipe b/resources/recipes/biggovernment.recipe
index ccb4e64678..0e52c898d6 100644
--- a/resources/recipes/biggovernment.recipe
+++ b/resources/recipes/biggovernment.recipe
@@ -3,7 +3,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class BigGovernmentRecipe(BasicNewsRecipe):
     __license__  = 'GPL v3'
     __author__ = 'kwetal'
-    language = 'en_US'
+    language = 'en'
     version = 1
 
     title = u'Big Government'
diff --git a/resources/recipes/propublica.recipe b/resources/recipes/propublica.recipe
index 5c35fe648e..8d92fdbde3 100644
--- a/resources/recipes/propublica.recipe
+++ b/resources/recipes/propublica.recipe
@@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class ProPublicaRecipe(BasicNewsRecipe):
     __license__  = 'GPL v3'
     __author__ = 'kwetal'
-    language = 'en_US'
+    language = 'en'
     version = 1
 
     title = u'Pro Publica'
diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index fe89e57a94..0e246f5c54 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -92,7 +92,8 @@ class SHINEBOOK(EB600):
             if not iswindows:
                 return dev[4] == 'ShineBook'
         except:
-            return True
+            pass
+        return True
 
 
 
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index e4244a5fd4..5d09d3821f 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -869,8 +869,7 @@ class Device(DeviceConfig, DevicePlugin):
 
         if special_tag is None:
             from calibre.library.save_to_disk import get_components
-            extra_components = get_components(template, mdata, fname,
-                replace_whitespace=True)
+            extra_components = get_components(template, mdata, fname)
         else:
             tag = special_tag
             if tag.startswith(_('News')):