diff --git a/include/caosdb/connection.h b/include/caosdb/connection.h
index 9a62b4d8ee21af0e27915a986fe7ecc2ada37eed..e2a17390293f43bf2d6cc8a2af77f5ca23ab13d0 100644
--- a/include/caosdb/connection.h
+++ b/include/caosdb/connection.h
@@ -44,7 +44,7 @@
 #include <memory>                          // for shared_ptr, unique_ptr
 #include <string>                          // for string, basic_string
 #ifdef BUILD_ACM
-#include <vector>                           // for vector
+#include <vector> // for vector
 #endif
 
 namespace caosdb::connection {
diff --git a/include/caosdb/transaction_status.h b/include/caosdb/transaction_status.h
index d46f3911aa17fbf518fd43b91e3568e4e4740c2f..56bd55be6c0af5adda94fff6f49bd6781ad50816 100644
--- a/include/caosdb/transaction_status.h
+++ b/include/caosdb/transaction_status.h
@@ -40,7 +40,7 @@ using caosdb::exceptions::TransactionTypeError;
  * Define static factory method in the TransactionStatus class.
  */
 #define CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(_StatusName, _StatusCode)                        \
-  inline static auto _StatusName()->const TransactionStatus & {                                    \
+  inline static auto _StatusName() -> const TransactionStatus & {                                  \
     static const TransactionStatus instance(_StatusCode,                                           \
                                             caosdb::get_status_description(_StatusCode));          \
     return instance;                                                                               \
diff --git a/src/caosdb/configuration.cpp b/src/caosdb/configuration.cpp
index e1ffb23b3b1a2db5ecea79588c237bb36e79b1e1..8fbf9fed79eba523784fa78468b1b889d6c9ca31 100644
--- a/src/caosdb/configuration.cpp
+++ b/src/caosdb/configuration.cpp
@@ -55,7 +55,7 @@
     throw ConfigurationError("This CaosDB client has not been configured.");                       \
   }                                                                                                \
   assert(WRAPPED_JSON_CONFIGURATION(this)->is_object());                                           \
-  const auto &configuration = WRAPPED_JSON_CONFIGURATION(this)->as_object();                       \
+  const auto &configuration = WRAPPED_JSON_CONFIGURATION(this) -> as_object();                     \
   if (!configuration.contains("connections")) {                                                    \
     throw ConfigurationError("This CaosDB client hasn't any configured connections.");             \
   }                                                                                                \
diff --git a/src/caosdb/connection.cpp b/src/caosdb/connection.cpp
index 53ff587cb758028c78f409c1f0ad5ff2c69fc1e7..550e35aac5c58383b7a8129bc68330769c5260ad 100644
--- a/src/caosdb/connection.cpp
+++ b/src/caosdb/connection.cpp
@@ -37,7 +37,7 @@
 #include <grpcpp/support/status.h>       // for Status
 #include <string>                        // for string, operator+
 #ifdef BUILD_ACM
-#include <vector>                           // for vector
+#include <vector> // for vector
 #endif
 // IWYU pragma: no_include "net/proto2/public/repeated_field.h"
 
diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index ae1a728f62b7cdfb293eb347d1a1966b86bfd3b2..82bcbae2c6eaee34368a871c9a5b7f983e838a2a 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -83,7 +83,7 @@ extern "C" {
       auto *wrapped_entity = WRAPPED_ENTITY_CAST(entity);                                          \
       auto *tmp = (char *)malloc(sizeof(char) * wrapped_entity->GetFunction.length() + 1);         \
       strcpy(tmp, wrapped_entity->GetFunction.c_str());                                            \
-      delete[] * out;                                                                              \
+      delete[] *out;                                                                               \
       *out = tmp;                                                                                  \
       return 0;                                                                                    \
     })
@@ -109,7 +109,7 @@ extern "C" {
       auto *wrapped_property = WRAPPED_PROPERTY_CAST(property);                                    \
       auto *tmp = (char *)malloc(sizeof(char) * wrapped_property->GetFunction.length() + 1);       \
       strcpy(tmp, wrapped_property->GetFunction.c_str());                                          \
-      delete[] * out;                                                                              \
+      delete[] *out;                                                                               \
       *out = tmp;                                                                                  \
       return 0;                                                                                    \
     })
@@ -136,7 +136,7 @@ extern "C" {
       auto *wrapped_parent = WRAPPED_PARENT_CAST(parent);                                          \
       auto *tmp = (char *)malloc(sizeof(char) * wrapped_parent->GetFunction.length() + 1);         \
       strcpy(tmp, wrapped_parent->GetFunction.c_str());                                            \
-      delete[] * out;                                                                              \
+      delete[] *out;                                                                               \
       *out = tmp;                                                                                  \
       return 0;                                                                                    \
     })
@@ -729,7 +729,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     std::string role_str = ENUM_NAME_FROM_VALUE(wrapped_entity->GetRole(), Role);
                     auto *tmp = (char *)malloc(sizeof(char) * role_str.length() + 1);
                     strcpy(tmp, role_str.c_str());
-                    delete[] * out;
+                    delete[] *out;
                     *out = tmp;
                     return 0;
                   })
@@ -741,7 +741,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     auto path = wrapped_entity->GetLocalPath().string();
                     auto *tmp = (char *)(malloc(sizeof(char) * path.length() + 1));
                     strcpy(tmp, path.c_str());
-                    delete[] * out;
+                    delete[] *out;
                     *out = tmp;
                     return 0;
                   })
@@ -887,7 +887,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                       ENUM_NAME_FROM_VALUE(wrapped_property->GetImportance(), Importance);
                     char *tmp = (char *)malloc(sizeof(char) * importance_str.length() + 1);
                     strcpy(tmp, importance_str.c_str());
-                    delete[] * out;
+                    delete[] *out;
                     *out = tmp;
                     return 0;
                   })
@@ -925,7 +925,7 @@ ERROR_RETURN_CODE(
     auto *wrapped_message = static_cast<caosdb::entity::Message *>(message->wrapped_message);
     auto *tmp = (char *)malloc(sizeof(char) * wrapped_message->GetDescription().length() + 1);
     strcpy(tmp, wrapped_message->GetDescription().c_str());
-    delete[] * out;
+    delete[] *out;
     *out = tmp;
     return 0;
   })
@@ -1000,7 +1000,7 @@ ERROR_RETURN_CODE(
     }
     char *tmp = (char *)malloc(sizeof(char) * datatype_name.length() + 1);
     strcpy(tmp, datatype_name.c_str());
-    delete[] * out;
+    delete[] *out;
     *out = tmp;
     return 0;
   })
@@ -1018,7 +1018,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     auto *tmp =
                       (char *)malloc(sizeof(char) * wrapped_value->GetAsString().length() + 1);
                     strcpy(tmp, wrapped_value->GetAsString().c_str());
-                    delete[] * out;
+                    delete[] *out;
                     *out = tmp;
                     return 0;
                   })