diff --git a/src/Gui/EditableDatumLabel.cpp b/src/Gui/EditableDatumLabel.cpp
index 14193d0aba..9d4c7d4743 100644
--- a/src/Gui/EditableDatumLabel.cpp
+++ b/src/Gui/EditableDatumLabel.cpp
@@ -57,6 +57,7 @@ EditableDatumLabel::EditableDatumLabel(View3DInventorViewer* view,
     , viewer(view)
     , spinBox(nullptr)
     , cameraSensor(nullptr)
+    , function(Function::Positioning)
 {
     // NOLINTBEGIN
     root = new SoAnnotation;
diff --git a/src/Gui/EditableDatumLabel.h b/src/Gui/EditableDatumLabel.h
index 0e8a5aba51..d2a7acf6c4 100644
--- a/src/Gui/EditableDatumLabel.h
+++ b/src/Gui/EditableDatumLabel.h
@@ -45,13 +45,13 @@ class GuiExport EditableDatumLabel : public QObject
     Q_DISABLE_COPY(EditableDatumLabel)
 
 public:
-    EditableDatumLabel(View3DInventorViewer* view, const Base::Placement& plc, SbColor color, bool autoDistance = false, bool avoidMouseCursor = false);
-
     enum class Function {
         Positioning,
         Dimensioning
     };
 
+    EditableDatumLabel(View3DInventorViewer* view, const Base::Placement& plc, SbColor color, bool autoDistance = false, bool avoidMouseCursor = false);
+
     ~EditableDatumLabel() override;
 
     void activate();
diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 112e1dbadf..2ca752fc85 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -1263,7 +1263,7 @@ public:
 class DrawSketchHandlerDimension : public DrawSketchHandler
 {
 public:
-    DrawSketchHandlerDimension(std::vector<std::string> SubNames)
+    explicit DrawSketchHandlerDimension(std::vector<std::string> SubNames)
         : specialConstraint(SpecialConstraint::None)
         , availableConstraint(AvailableConstraint::FIRST)
         , previousOnSketchPos(Base::Vector2d(0.f, 0.f))
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h
index 10cf44a912..1ca7c2d1ea 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h
@@ -79,7 +79,8 @@ class DrawSketchHandlerLine: public DrawSketchHandlerLineBase
     friend DSHLineControllerBase;
 
 public:
-    DrawSketchHandlerLine(ConstructionMethod constrMethod = ConstructionMethod::OnePointLengthAngle)
+    explicit DrawSketchHandlerLine(
+        ConstructionMethod constrMethod = ConstructionMethod::OnePointLengthAngle)
         : DrawSketchHandlerLineBase(constrMethod) {};
     ~DrawSketchHandlerLine() override = default;
 
@@ -271,7 +272,7 @@ void DSHLineController::configureToolWidget()
 {
     if (!init) {  // Code to be executed only upon initialisation
         QStringList names = {QStringLiteral("Point, length, angle"),
-                             QStringLiteral("Point, width, heigth"),
+                             QStringLiteral("Point, width, height"),
                              QStringLiteral("2 points")};
         toolWidget->setComboboxElements(WCombobox::FirstCombo, names);
 
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h
index bacfcad043..4d123d5089 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h
@@ -68,7 +68,7 @@ class DrawSketchHandlerPolygon: public DrawSketchHandlerPolygonBase
     friend DSHPolygonControllerBase;
 
 public:
-    DrawSketchHandlerPolygon(int corners = 6)
+    explicit DrawSketchHandlerPolygon(int corners = 6)
         : numberOfCorners(corners)
     {}
     ~DrawSketchHandlerPolygon() override = default;
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
index 6b4d7e2bf5..ed44ef6ddb 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
@@ -479,7 +479,7 @@ public:
     class ToolManager
     {
     public:
-        ToolManager(ViewProviderSketch* vp);
+        explicit ToolManager(ViewProviderSketch* vp);
 
         /** @brief Factory function returning a tool widget of the type appropriate for the current
          * active tool. If no tool is active, expect a nullptr.