diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py
index d774972f9b..b6a8b613c8 100644
--- a/src/Mod/Path/InitGui.py
+++ b/src/Mod/Path/InitGui.py
@@ -98,6 +98,7 @@ class PathWorkbench (Workbench):
 
             try:
                 import ocl # pylint: disable=unused-variable
+                from PathScripts import PathSurfaceGui
                 threedopcmdlist.append("Path_Surface")
                 threedcmdgroup = ['Path_3dTools']
                 FreeCADGui.addCommand('Path_3dTools', PathCommandGroup(threedopcmdlist, QtCore.QT_TRANSLATE_NOOP("Path",'3D Operations')))
diff --git a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py
index d512ad5638..667d054eda 100644
--- a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py
+++ b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py
@@ -739,22 +739,26 @@ class ObjectTagDressup:
         obj.addProperty("App::PropertyIntegerList", "Disabled", "Tag", QtCore.QT_TRANSLATE_NOOP("Path_DressupTag", "IDs of disabled holding tags"))
         obj.addProperty("App::PropertyInteger", "SegmentationFactor", "Tag", QtCore.QT_TRANSLATE_NOOP("Path_DressupTag", "Factor determining the # of segments used to approximate rounded tags."))
 
+        self.__setstate__(obj)
+
         obj.Proxy = self
         obj.Base = base
 
-        self.obj = obj
-        self.solids = []
-        self.tags = []
-        self.pathData = None
-        self.toolRadius = None
-        self.mappers = []
-
     def __getstate__(self):
         return None
 
     def __setstate__(self, state):
+        self.obj = state
+        self.solids = []
+        self.tags = []
+        self.pathData = None
+        self.toolRadius = None
+        self.mappers = []
         return None
 
+    def onDocumentRestored(self, obj):
+        self.obj = obj
+
     def supportsTagGeneration(self, obj):
         if not self.pathData:
             self.setup(obj)
diff --git a/src/Mod/Path/PathScripts/PathDressupTagGui.py b/src/Mod/Path/PathScripts/PathDressupTagGui.py
index 43d9b4e997..a14cb6c261 100644
--- a/src/Mod/Path/PathScripts/PathDressupTagGui.py
+++ b/src/Mod/Path/PathScripts/PathDressupTagGui.py
@@ -229,7 +229,7 @@ class PathDressupTagTaskPanel:
             self.Positions.append(FreeCAD.Vector(point.x, point.y, 0))
             self.updateTagsView()
         else:
-            print("ignore new tag at %s (obj=%s, on-path=%d" % (point, obj, 0))
+            PathLog.notice("ignore new tag at %s (obj=%s, on-path=%d" % (point, obj, 0))
 
     def addNewTag(self):
         self.tags = self.getTags(True)
diff --git a/src/Mod/Path/PathScripts/PathGuiInit.py b/src/Mod/Path/PathScripts/PathGuiInit.py
index 7ca84d5a1a..da66403398 100644
--- a/src/Mod/Path/PathScripts/PathGuiInit.py
+++ b/src/Mod/Path/PathScripts/PathGuiInit.py
@@ -68,12 +68,6 @@ def Startup():
         from PathScripts import PathSimpleCopy
         from PathScripts import PathSimulatorGui
         from PathScripts import PathStop
-        try:
-            import ocl
-            from PathScripts import PathSurfaceGui
-        except ImportError:
-            import FreeCAD
-            FreeCAD.Console.PrintError("OpenCamLib is not working!\n")
         from PathScripts import PathToolController
         from PathScripts import PathToolControllerGui
         from PathScripts import PathToolLibraryManager