diff --git a/Applications/ApplicationsLib/TestDefinition.cpp b/Applications/ApplicationsLib/TestDefinition.cpp
index 15229582548d931e1298234a7de7dd443cb28de5..8e892e4dc73821777aba8b3b4077c34cb6b6004f 100644
--- a/Applications/ApplicationsLib/TestDefinition.cpp
+++ b/Applications/ApplicationsLib/TestDefinition.cpp
@@ -59,7 +59,9 @@ bool isConvertibleToDouble(std::string const& s)
 /// Wraps a string into double ticks.
 std::string safeString(std::string const& s)
 {
-    return "\"" + s + "\"";
+    std::stringstream ss;
+    ss << std::quoted(s);
+    return ss.str();
 }
 
 /// Tries to find a vtkdiff executable by testing 'path/vtkdiff --version' calls
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalNodeCoordinates.h b/NumLib/Fem/CoordinatesMapping/NaturalNodeCoordinates.h
index 0a6e433f02e2aace81c0799de948c8e16cbdb3e0..8e4604c9ec6a1acbec6f9ed7a3abe278ab07c7ab 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalNodeCoordinates.h
+++ b/NumLib/Fem/CoordinatesMapping/NaturalNodeCoordinates.h
@@ -8,6 +8,8 @@
  *
  */
 
+#pragma once
+
 #include <cassert>
 
 #include "MathLib/Point3d.h"
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index 7b72b5b21426e96d0b8c2ae231c23288ee7de379..be17d50166f7d1bb7127a7524f5ec474dfc79913 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -209,7 +209,7 @@ Eigen::Vector3d ComponentTransportProcess::getFlux(
 void ComponentTransportProcess::
     setCoupledTermForTheStaggeredSchemeToLocalAssemblers(int const process_id)
 {
-    DBUG("Set the coupled term for the staggered scheme to local assembers.");
+    DBUG("Set the coupled term for the staggered scheme to local assemblers.");
 
     ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
     GlobalExecutor::executeSelectedMemberOnDereferenced(
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 9171223f3dcd59d5e064b48647cfef88b58e6f16..a87991e544358b80a8a8bc27b841094c195603c7 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -139,7 +139,7 @@ void HTProcess::assembleWithJacobianConcreteProcess(
 void HTProcess::setCoupledTermForTheStaggeredSchemeToLocalAssemblers(
     int const process_id)
 {
-    DBUG("Set the coupled term for the staggered scheme to local assembers.");
+    DBUG("Set the coupled term for the staggered scheme to local assemblers.");
 
     ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
     GlobalExecutor::executeSelectedMemberOnDereferenced(
diff --git a/ProcessLib/SmallDeformation/CreateLocalAssemblers.h b/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
index fb6adf1266134b478c76410d12243da3a3734234..39222c35e4e6b959128ea847b429090f1371753e 100644
--- a/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
+++ b/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
@@ -31,9 +31,9 @@ void createLocalAssemblers(
     ExtraCtorArgs&&... extra_ctor_args)
 {
     using LocAsmFactory =
-        ProcessLib::LocalAssemberFactorySD<LocalAssemblerInterface,
-                                           LocalAssemblerImplementation,
-                                           GlobalDim, ExtraCtorArgs...>;
+        ProcessLib::LocalAssemblerFactorySD<LocalAssemblerInterface,
+                                            LocalAssemblerImplementation,
+                                            GlobalDim, ExtraCtorArgs...>;
 
     DBUG("Create local assemblers.");
 
diff --git a/ProcessLib/Utils/CreateLocalAssemblers.h b/ProcessLib/Utils/CreateLocalAssemblers.h
index b9119d84f70076f4f34d215eae8f69d355f61f11..8f86d6e7a772af7002d0baecce6eed23f5eaaf4b 100644
--- a/ProcessLib/Utils/CreateLocalAssemblers.h
+++ b/ProcessLib/Utils/CreateLocalAssemblers.h
@@ -30,9 +30,9 @@ void createLocalAssemblers(
         GlobalDim == 1 || GlobalDim == 2 || GlobalDim == 3,
         "Meshes with dimension greater than three are not supported.");
 
-    using LocAsmFactory = LocalAssemberFactory<LocalAssemblerInterface,
-                                               LocalAssemblerImplementation,
-                                               GlobalDim, ExtraCtorArgs...>;
+    using LocAsmFactory = LocalAssemblerFactory<LocalAssemblerInterface,
+                                                LocalAssemblerImplementation,
+                                                GlobalDim, ExtraCtorArgs...>;
 
     DBUG("Create local assemblers.");
 
diff --git a/ProcessLib/Utils/LocalAssemblerFactoryForDimGreaterEqualN.h b/ProcessLib/Utils/LocalAssemblerFactoryForDimGreaterEqualN.h
index 59b372f15ae384e0835ec825a8cd27856ce96342..c84b28292b19df1a0a9d90d3a372a9ae39a9a950 100644
--- a/ProcessLib/Utils/LocalAssemblerFactoryForDimGreaterEqualN.h
+++ b/ProcessLib/Utils/LocalAssemblerFactoryForDimGreaterEqualN.h
@@ -79,7 +79,7 @@ template <typename LocalAssemblerInterface,
           class LocalAssemblerImplementation,
           int GlobalDim,
           typename... ConstructorArgs>
-using LocalAssemberFactory =
+using LocalAssemblerFactory =
     LocalAssemblerFactoryForDimGreaterEqualN<1,
                                              LocalAssemblerInterface,
                                              LocalAssemblerImplementation,
@@ -92,7 +92,7 @@ template <typename LocalAssemblerInterface,
           class LocalAssemblerImplementation,
           int GlobalDim,
           typename... ConstructorArgs>
-using LocalAssemberFactorySD =
+using LocalAssemblerFactorySD =
     LocalAssemblerFactoryForDimGreaterEqualN<2,
                                              LocalAssemblerInterface,
                                              LocalAssemblerImplementation,