diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp
index f9d936502..eda09eb61 100644
--- a/src/libs/ifc/xml/vpatternconverter.cpp
+++ b/src/libs/ifc/xml/vpatternconverter.cpp
@@ -132,6 +132,7 @@ const QString strInLayout                  = QStringLiteral("inLayout");
 const QString strSeamAllowance             = QStringLiteral("seamAllowance");
 const QString strNodeType                  = QStringLiteral("nodeType");
 const QString strDet                       = QStringLiteral("det");
+const QString strTypeObject                = QStringLiteral("typeObject");
 
 //---------------------------------------------------------------------------------------------------------------------
 VPatternConverter::VPatternConverter(const QString &fileName)
@@ -1716,9 +1717,9 @@ void VPatternConverter::TagRemoveAttributeTypeObjectInV0_4_0()
                 QDomElement domElement = domNode.toElement();
                 if (not domElement.isNull())
                 {
-                    if (domElement.hasAttribute(strNodeType))
+                    if (domElement.hasAttribute(strTypeObject))
                     {
-                        domElement.removeAttribute(strNodeType);
+                        domElement.removeAttribute(strTypeObject);
                     }
                 }
                 domNode = domNode.nextSibling();
diff --git a/src/libs/vpatterndb/vpiecepath.cpp b/src/libs/vpatterndb/vpiecepath.cpp
index 2a35473e4..91e6a8723 100644
--- a/src/libs/vpatterndb/vpiecepath.cpp
+++ b/src/libs/vpatterndb/vpiecepath.cpp
@@ -580,8 +580,8 @@ QPointF VPiecePath::NodePreviousPoint(const VContainer *data, int i) const
             {
                 const QSharedPointer<VAbstractCurve> curve = data->GeometricObject<VAbstractCurve>(node.GetId());
 
-                const VSAPoint begin = StartSegment(data, d->m_nodes, i, node.GetReverse());
-                const VSAPoint end = EndSegment(data, d->m_nodes, i, node.GetReverse());
+                const VSAPoint begin = StartSegment(data, d->m_nodes, index, node.GetReverse());
+                const VSAPoint end = EndSegment(data, d->m_nodes, index, node.GetReverse());
 
                 const QVector<QPointF> points = curve->GetSegmentPoints(begin, end, node.GetReverse());
                 if (points.size() > 1)
@@ -631,8 +631,8 @@ QPointF VPiecePath::NodeNextPoint(const VContainer *data, int i) const
             {
                 const QSharedPointer<VAbstractCurve> curve = data->GeometricObject<VAbstractCurve>(node.GetId());
 
-                const VSAPoint begin = StartSegment(data, d->m_nodes, i, node.GetReverse());
-                const VSAPoint end = EndSegment(data, d->m_nodes, i, node.GetReverse());
+                const VSAPoint begin = StartSegment(data, d->m_nodes, index, node.GetReverse());
+                const VSAPoint end = EndSegment(data, d->m_nodes, index, node.GetReverse());
 
                 const QVector<QPointF> points = curve->GetSegmentPoints(begin, end, node.GetReverse());
                 if (points.size() > 1)