diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h
index 6de939c37f19d9419815dcb8b7001fd19050133f..8aea41bc70e4a03c472abc5b0d244da797c258bf 100644
--- a/include/caosdb/entity.h
+++ b/include/caosdb/entity.h
@@ -348,6 +348,9 @@ private:
   inline Messages() : RepeatedPtrFieldWrapper(){};
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// class Parent ///////////////////////////////////////////////////////////////
+
 /**
  * Parent of an Entity.
  *
@@ -436,6 +439,9 @@ private:
     : RepeatedPtrFieldWrapper(wrapped){};
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// class Property /////////////////////////////////////////////////////////////
+
 /**
  * Property of an Entity.
  *
@@ -615,6 +621,9 @@ private:
     : RepeatedPtrFieldWrapper<Property, ProtoProperty>(wrapped){};
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// class Entity ///////////////////////////////////////////////////////////////
+
 /**
  * Entity is the central and basic data object of CaosDB.
  *
diff --git a/src/caosdb/file_transmission/file_reader.cpp b/src/caosdb/file_transmission/file_reader.cpp
index 1a78e5a76513ae0aaf94b2ae4967af5d7b66e0c0..e40e646da3831eee91f8ef9ecfbca1085c389d94 100644
--- a/src/caosdb/file_transmission/file_reader.cpp
+++ b/src/caosdb/file_transmission/file_reader.cpp
@@ -79,7 +79,7 @@ std::size_t FileReader::read(std::string &buffer) {
     if (bufferSize > 0) {
       // TODO(henrik): fix nolint
       if (!stream_.read(&buffer[0], bufferSize)) { // NOLINT
-        throw FileIOError("Can't read file: " + filename_.string());
+        throw FileIOError("Can't read data from file: " + filename_.string());
       }
 
       bytesRead = static_cast<std::size_t>(stream_.gcount());
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index 6380dcdde6f845ae4507328d5ccb073d82942b06..8cceb7a13ebe7cbe70c20e8cb1ef8fa6e0dc0545 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -344,7 +344,7 @@ auto Transaction::WaitForIt() const noexcept -> TransactionStatus { // NOLINT
     default:
       CAOSDB_LOG_FATAL(logger_name) << "Received invalid TransactionResponseCase.";
       break;
-    }
+    } // default to sub_response.transaction_response_case()
     if (result != nullptr) {
       if (result->HasErrors()) {
         set_error = true;