diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py
index 70578d0e02..e37268e244 100755
--- a/cura/BuildVolume.py
+++ b/cura/BuildVolume.py
@@ -489,6 +489,7 @@ class BuildVolume(SceneNode):
 
             self._updateDisallowedAreas()
             self._updateRaftThickness()
+            self._updateExtraZClearance()
 
             if self._engine_ready:
                 self.rebuild()
@@ -546,6 +547,8 @@ class BuildVolume(SceneNode):
     #   would hit performance.
     def _updateDisallowedAreasAndRebuild(self):
         self._updateDisallowedAreas()
+        self._updateRaftThickness()
+        self._updateExtraZClearance()
         self.rebuild()
 
     def _updateDisallowedAreas(self):
diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json
index 59ac6c172e..8ed194fc2d 100644
--- a/resources/definitions/fdmextruder.def.json
+++ b/resources/definitions/fdmextruder.def.json
@@ -6,7 +6,7 @@
     {
         "type": "extruder",
         "author": "Ultimaker",
-        "manufacturer": "Ultimaker B.V.",
+        "manufacturer": "Unknown",
         "setting_version": 1,
         "visible": false
     },
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index ea9fc46b16..bdb95a6de3 100755
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -5,9 +5,9 @@
     "metadata":
     {
         "type": "machine",
-        "author": "Ultimaker B.V.",
+        "author": "Ultimaker",
         "category": "Ultimaker",
-        "manufacturer": "Ultimaker B.V.",
+        "manufacturer": "Unknown",
         "setting_version": 1,
         "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
         "visible": false,