diff --git a/src/Mod/TechDraw/App/EdgeWalker.cpp b/src/Mod/TechDraw/App/EdgeWalker.cpp
index 3ba07f8874..6d274187c2 100644
--- a/src/Mod/TechDraw/App/EdgeWalker.cpp
+++ b/src/Mod/TechDraw/App/EdgeWalker.cpp
@@ -343,6 +343,7 @@ std::vector<WalkerEdge> EdgeWalker::makeWalkerEdges(std::vector<TopoDS_Edge> edg
         WalkerEdge we;
         we.v1 = v1dx;
         we.v2 = v2dx;
+        we.idx = 0;
         walkerEdges.push_back(we);
     }
 
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index 324134ed78..34d56cfcce 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -124,6 +124,8 @@ MDIViewPage::MDIViewPage(ViewProviderPage *pageVp, Gui::Document* doc, QWidget*
     m_orientation(QPrinter::Landscape),
     m_paperSize(QPrinter::A4),
 #endif
+    pagewidth(0.0),
+    pageheight(0.0),
     m_vpPage(pageVp)
 {
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index c23ba6d2ec..05d22be0cd 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -100,6 +100,8 @@ QGIDatumLabel::QGIDatumLabel()
     posX = 0;
     posY = 0;
 
+    parent = nullptr;
+
     setCacheMode(QGraphicsItem::NoCache);
     setFlag(ItemSendsGeometryChanges, true);
     setFlag(ItemIsMovable, true);
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index 9c79ba7c79..bf822df1f3 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -402,8 +402,10 @@ void TaskLeaderLine::createLeaderFeature(std::vector<Base::Vector3d> converted)
                        m_leaderType.c_str(),m_leaderName.c_str());
     Command::doCommand(Command::Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",
                        PageName.c_str(),m_leaderName.c_str());
-    Command::doCommand(Command::Doc,"App.activeDocument().%s.LeaderParent = App.activeDocument().%s",
-                           m_leaderName.c_str(),m_baseFeat->getNameInDocument());
+    if (m_baseFeat != nullptr) {
+        Command::doCommand(Command::Doc,"App.activeDocument().%s.LeaderParent = App.activeDocument().%s",
+                               m_leaderName.c_str(),m_baseFeat->getNameInDocument());
+    }
 
     App::DocumentObject* obj = m_basePage->getDocument()->getObject(m_leaderName.c_str());
     if (obj == nullptr) {
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
index 62d0d30e27..af7f7718d4 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
@@ -76,6 +76,7 @@ using namespace TechDrawGui;
 TaskRichAnno::TaskRichAnno(TechDrawGui::ViewProviderRichAnno* annoVP) :
     ui(new Ui_TaskRichAnno),
     blockUpdate(false),
+    m_mdi(nullptr),
     m_view(nullptr),
     m_annoVP(annoVP),
     m_baseFeat(nullptr),
diff --git a/src/Mod/TechDraw/TDTest/DVBalloonTest.py b/src/Mod/TechDraw/TDTest/DVBalloonTest.py
index b7b96cb52f..1ff080b4bf 100644
--- a/src/Mod/TechDraw/TDTest/DVBalloonTest.py
+++ b/src/Mod/TechDraw/TDTest/DVBalloonTest.py
@@ -76,7 +76,7 @@ def DVBalloonTest():
     FreeCAD.ActiveDocument.recompute()
 
     rc = False
-    if ("Up-to-date" in balloon2.State) and ("Up-to-date" in balloon2.State):
+    if ("Up-to-date" in balloon1.State) and ("Up-to-date" in balloon2.State):
         rc = True
     FreeCAD.closeDocument("TDBalloon")
     return rc