diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py
index 3b97323af..8b6b552be 100644
--- a/openlp/core/lib/spelltextedit.py
+++ b/openlp/core/lib/spelltextedit.py
@@ -142,6 +142,7 @@ class SpellTextEdit(QtWidgets.QPlainTextEdit):
         """
         Replaces the selected text with word.
         """
+        tag = tag.replace('&', '')
         for html in FormattingTags.get_html_tags():
             if tag == html['desc']:
                 cursor = self.textCursor()
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 6db806995..cb49f528a 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -1322,8 +1322,8 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa
         The theme may have changed in the settings dialog so make sure the theme combo box is in the correct state.
         """
         visible = self.renderer.theme_level == ThemeLevel.Global
-        self.theme_label.setVisible(visible)
-        self.theme_combo_box.setVisible(visible)
+        self.toolbar.actions['theme_combo_box'].setVisible(visible)
+        self.toolbar.actions['theme_label'].setVisible(visible)
         self.regenerate_service_items()
 
     def regenerate_service_items(self, changed=False):
diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index 26f00c359..88d1097dc 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -167,7 +167,6 @@ class HTTPSServer(HTTPServer):
         local_data = AppLocation.get_directory(AppLocation.DataDir)
         self.socket = ssl.SSLSocket(
             sock=socket.socket(self.address_family, self.socket_type),
-            ssl_version=ssl.PROTOCOL_TLSv1_2,
             certfile=os.path.join(local_data, 'remotes', 'openlp.crt'),
             keyfile=os.path.join(local_data, 'remotes', 'openlp.key'),
             server_side=True)