diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py
index 0d27a78748..b037fab655 100644
--- a/cura/BuildVolume.py
+++ b/cura/BuildVolume.py
@@ -101,6 +101,8 @@ class BuildVolume(SceneNode):
             " with printed models."))
 
         # Must be after setting _build_volume_message, apparently that is used in getMachineManager.
+        # activeQualityChanged is always emitted after setActiveVariant, setActiveMaterial and setActiveQuality.
+        # Therefore this works.
         Application.getInstance().getMachineManager().activeQualityChanged.connect(self._onStackChanged)
 
     def _onSceneChanged(self, source):
diff --git a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
index f9dd0db85c..efb7929327 100644
--- a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
+++ b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
@@ -113,4 +113,9 @@ class RemovableDriveOutputDevice(OutputDevice):
     def _onActionTriggered(self, message, action):
         if action == "eject":
             if Application.getInstance().getOutputDeviceManager().getOutputDevicePlugin("RemovableDriveOutputDevice").ejectDevice(self):
-                message.hide()
\ No newline at end of file
+                message.hide()
+
+                eject_message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(self.getName()))
+            else:
+                eject_message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Another program may be using the drive.").format(self.getName()))
+            eject_message.show()
diff --git a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
index 90adac73b1..2fbd554849 100644
--- a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
+++ b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
@@ -46,11 +46,6 @@ class RemovableDrivePlugin(OutputDevicePlugin):
 
         if result:
             Logger.log("i", "Succesfully ejected the device")
-            message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName()))
-            message.show()
-        else:
-            message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Another program may be using the drive.").format(device.getName()))
-            message.show()
         return result
 
     def performEjectDevice(self, device):
diff --git a/resources/themes/cura/fonts/OpenSans-ExtraBold.ttf b/resources/themes/cura/fonts/OpenSans-ExtraBold.ttf
deleted file mode 100644
index 21f6f84a07..0000000000
Binary files a/resources/themes/cura/fonts/OpenSans-ExtraBold.ttf and /dev/null differ
diff --git a/resources/themes/cura/fonts/OpenSans-ExtraBoldItalic.ttf b/resources/themes/cura/fonts/OpenSans-ExtraBoldItalic.ttf
deleted file mode 100644
index 31cb688340..0000000000
Binary files a/resources/themes/cura/fonts/OpenSans-ExtraBoldItalic.ttf and /dev/null differ