diff --git a/src/calibre/ebooks/conversion/plugins/pdf_output.py b/src/calibre/ebooks/conversion/plugins/pdf_output.py
index c0b54f3879..762f383fef 100644
--- a/src/calibre/ebooks/conversion/plugins/pdf_output.py
+++ b/src/calibre/ebooks/conversion/plugins/pdf_output.py
@@ -84,11 +84,11 @@ class PDFOutput(OutputFormatPlugin):
                 'The font family used to render sans-serif fonts')),
         OptionRecommendation(name='pdf_mono_family',
             recommended_value='Liberation Mono' if islinux else 'Courier New', help=_(
-                'The font family used to render monospaced fonts')),
+                'The font family used to render monospace fonts')),
         OptionRecommendation(name='pdf_standard_font', choices=['serif',
             'sans', 'mono'],
             recommended_value='serif', help=_(
-                'The font family used to render monospaced fonts')),
+                'The font family used to render monospace fonts')),
         OptionRecommendation(name='pdf_default_font_size',
             recommended_value=20, help=_(
                 'The default font size')),
diff --git a/src/calibre/ebooks/oeb/polish/download.py b/src/calibre/ebooks/oeb/polish/download.py
index c3871cab0d..74cd7fc553 100644
--- a/src/calibre/ebooks/oeb/polish/download.py
+++ b/src/calibre/ebooks/oeb/polish/download.py
@@ -45,7 +45,7 @@ def get_external_resources(container):
             elif media_type in OEB_STYLES:
                 for link in container.iterlinks(name):
                     ans[link].append(name)
-    return ans
+    return dict(ans)
 
 
 def get_filename(original_url_parsed, response):
diff --git a/src/calibre/gui2/convert/lrf_output.ui b/src/calibre/gui2/convert/lrf_output.ui
index 02e8e909f4..5f986afb60 100644
--- a/src/calibre/gui2/convert/lrf_output.ui
+++ b/src/calibre/gui2/convert/lrf_output.ui
@@ -168,7 +168,7 @@
       <item row="2" column="0">
        <widget class="QLabel" name="label_8">
         <property name="text">
-         <string>&amp;Monospaced font family:</string>
+         <string>&amp;Monospace font family:</string>
         </property>
         <property name="buddy">
          <cstring>opt_mono_family</cstring>
diff --git a/src/calibre/gui2/progress_indicator/__init__.py b/src/calibre/gui2/progress_indicator/__init__.py
index dc6649022a..8c5ade8579 100644
--- a/src/calibre/gui2/progress_indicator/__init__.py
+++ b/src/calibre/gui2/progress_indicator/__init__.py
@@ -135,6 +135,14 @@ class WaitPanel(QWidget):
         self.la.setStyleSheet('QLabel { font-size: 40px; font-weight: bold }')
         l.addWidget(self.la, 0, Qt.AlignCenter), l.addStretch()
 
+    @property
+    def msg(self):
+        return self.la.text()
+
+    @msg.setter
+    def msg(self, val):
+        self.la.setText(val)
+
 
 class WaitStack(QStackedWidget):
 
diff --git a/src/calibre/gui2/viewer/config.py b/src/calibre/gui2/viewer/config.py
index f917aac3b9..a76796e28f 100644
--- a/src/calibre/gui2/viewer/config.py
+++ b/src/calibre/gui2/viewer/config.py
@@ -100,9 +100,9 @@ def config(defaults=None):
     fonts('sans_family', default='Verdana' if iswindows else 'Liberation Sans',
           help=_('The sans-serif font family'))
     fonts('mono_family', default='Courier New' if iswindows else 'Liberation Mono',
-          help=_('The monospaced font family'))
+          help=_('The monospace font family'))
     fonts('default_font_size', default=20, help=_('The standard font size in px'))
-    fonts('mono_font_size', default=16, help=_('The monospaced font size in px'))
+    fonts('mono_font_size', default=16, help=_('The monospace font size in px'))
     fonts('standard_font', default='serif', help=_('The standard font type'))
     fonts('minimum_font_size', default=8, help=_('The minimum font size in px'))