diff --git a/Applications/Utils/FileConverter/TIN2VTK.cpp b/Applications/Utils/FileConverter/TIN2VTK.cpp
index 27d290e2a2200b5bfde97f9e48b788b1e4009a72..2c3ce8cd6d0583e43cd232ef2b2d7f14df79a38a 100644
--- a/Applications/Utils/FileConverter/TIN2VTK.cpp
+++ b/Applications/Utils/FileConverter/TIN2VTK.cpp
@@ -56,13 +56,14 @@ int main (int argc, char* argv[])
 
     INFO("reading the TIN file...");
     const std::string tinFileName(inArg.getValue());
-    auto pnt_vec = std::make_unique<std::vector<GeoLib::Point*>>();
-    GeoLib::PointVec point_vec("SurfacePoints", std::move(pnt_vec));
+    GeoLib::PointVec point_vec("SurfacePoints",
+                               std::make_unique<std::vector<GeoLib::Point*>>());
     std::unique_ptr<GeoLib::Surface> sfc(
         GeoLib::IO::TINInterface::readTIN(tinFileName, point_vec));
     if (!sfc)
         return EXIT_FAILURE;
-    INFO("TIN read:  %d points, %d triangles", pnt_vec->size(), sfc->getNumberOfTriangles());
+    INFO("TIN read:  %d points, %d triangles", point_vec.size(),
+         sfc->getNumberOfTriangles());
 
     INFO("converting to mesh data");
     std::unique_ptr<MeshLib::Mesh> mesh(MeshLib::convertSurfaceToMesh(*sfc, BaseLib::extractBaseNameWithoutExtension(tinFileName), std::numeric_limits<double>::epsilon()));
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index 68523246e420c6345500c61f1c809bdcc2da1dc9..ee1d9baa8ef4d55dbdb5c981e59137017c204c50 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -219,7 +219,10 @@ void GEOObjects::addSurfaceVec(
 {
     _sfc_vecs.push_back(
         new SurfaceVec(name, std::move(sfc), std::move(sfc_names)));
-    if (!sfc || !sfc->empty()) _callbacks->addSurfaceVec(name);
+    if (_sfc_vecs.back()->size() == 0)
+    {
+        _callbacks->addSurfaceVec(name);
+    }
 }
 
 bool GEOObjects::appendSurfaceVec(const std::vector<Surface*>& surfaces,
diff --git a/GeoLib/IO/TINInterface.cpp b/GeoLib/IO/TINInterface.cpp
index 20cecd08b4003772e02cf030dc04375b71526978..125446e923625404af8b8b8f7452eab71136c64b 100644
--- a/GeoLib/IO/TINInterface.cpp
+++ b/GeoLib/IO/TINInterface.cpp
@@ -112,7 +112,8 @@ GeoLib::Surface* TINInterface::readTIN(std::string const& fname,
         // create new Triangle
         if (pnt_pos_0 != std::numeric_limits<std::size_t>::max() &&
             pnt_pos_1 != std::numeric_limits<std::size_t>::max() &&
-            pnt_pos_1 != std::numeric_limits<std::size_t>::max()) {
+            pnt_pos_2 != std::numeric_limits<std::size_t>::max())
+        {
             sfc->addTriangle(pnt_pos_0, pnt_pos_1, pnt_pos_2);
         }
     }
diff --git a/MaterialLib/SolidModels/CreepBGRa.h b/MaterialLib/SolidModels/CreepBGRa.h
index affcbd6091f589ecd05d0c562c7e20e68262c516..31b8d9126151607d4c3d6c1ffdfe94f8a0459acd 100644
--- a/MaterialLib/SolidModels/CreepBGRa.h
+++ b/MaterialLib/SolidModels/CreepBGRa.h
@@ -40,8 +40,7 @@ template <int DisplacementDim>
 class CreepBGRa final : public LinearElasticIsotropic<DisplacementDim>
 {
 public:
-    static int const KelvinVectorSize =
-        MathLib::KelvinVector::KelvinVectorDimensions<DisplacementDim>::value;
+    using LinearElasticIsotropic<DisplacementDim>::KelvinVectorSize;
     using ResidualVectorType = Eigen::Matrix<double, KelvinVectorSize, 1>;
     using JacobianMatrix = Eigen::Matrix<double, KelvinVectorSize,
                                          KelvinVectorSize, Eigen::RowMajor>;