diff --git a/src/Mod/PartDesign/App/FeaturePad.cpp b/src/Mod/PartDesign/App/FeaturePad.cpp
index 47e459204..f2f99784e 100644
--- a/src/Mod/PartDesign/App/FeaturePad.cpp
+++ b/src/Mod/PartDesign/App/FeaturePad.cpp
@@ -141,6 +141,8 @@ App::DocumentObjectExecReturn *Pad::execute(void)
             // because the feature does not add any material. This only happens with the "2" option, though
             // Note: It might be possible to pass a shell or a compound containing multiple faces
             // as the Until parameter of Perform()
+            // Note: Multiple independent wires are not supported, we should check for that and
+            // warn the user
             BRepFeat_MakePrism PrismMaker;
             PrismMaker.Init(support, sketchshape, supportface, dir, 2, 1);
             PrismMaker.Perform(upToFace);
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index 700a6dda7..4bb0b006a 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -814,6 +814,9 @@ void CmdPartDesignDraft::activated(int iMsg)
 
     // We don't create any defaults for neutral plane and pull direction, but Draft::execute()
     // will choose them.
+    // Note: When the body feature is there, the best thing would be to get pull direction and
+    // neutral plane from the preceding feature in the tree. Or even store them as default in
+    // the Body feature itself
     openCommand("Make Draft");
     doCommand(Doc,"App.activeDocument().addObject(\"PartDesign::Draft\",\"%s\")",FeatName.c_str());
     doCommand(Doc,"App.activeDocument().%s.Base = %s",FeatName.c_str(),SelString.c_str());