diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp
index 2dfeff7e2e..c0c02d3e45 100644
--- a/src/App/PropertyLinks.cpp
+++ b/src/App/PropertyLinks.cpp
@@ -1205,6 +1205,8 @@ static inline const std::string &getSubNameWithStyle(const std::string &subName,
                 return tmp;
             }
         }
+#else
+        (void) tmp;
 #endif
         return shadow.first;
     }
@@ -1259,8 +1261,8 @@ PyObject *PropertyLinkSub::getPyObject()
     Py::List list(static_cast<int>(_cSubList.size()));
     if (_pcLinkSub) {
         tup[0] = Py::asObject(_pcLinkSub->getPyObject());
-        int i = 0;
 #ifdef FC_USE_TNP_FIX
+        int i = 0;
         for (auto &sub : getSubValues(true))
             list[i++] = Py::String(sub);
 #else
diff --git a/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py b/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
index 8cfb7d4af2..a66113eb22 100644
--- a/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
+++ b/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
@@ -980,4 +980,3 @@ class TestTopologicalNamingProblem(unittest.TestCase):
     def tearDown(self):
         """ Close our test document """
         App.closeDocument("PartDesignTestTNP")
-        pass
\ No newline at end of file