diff --git a/src/caosdb/configuration.cpp b/src/caosdb/configuration.cpp
index 6cdd04c2a2d05bc1082821b24af18f48899f87b5..b5465cd17ef889860393bd50bb7b47fafbe6e658 100644
--- a/src/caosdb/configuration.cpp
+++ b/src/caosdb/configuration.cpp
@@ -468,7 +468,7 @@ auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
 
   // find the configuration file...
   std::unique_ptr<path> configuration_file_path;
-  for (const char* const &configuration_file :
+  for (const char *const &configuration_file :
        caosdb::LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE) {
     if (strcmp(configuration_file, "$CAOSDB_CLIENT_CONFIGURATION") == 0) {
       // user specified a file via the environment variable
diff --git a/src/caosdb/entity.cpp b/src/caosdb/entity.cpp
index 0ef5172842eacde57f63f3c81ceb1876390dcee6..24fd3824aa20c35a253f4cdd6d2020e180e1a1c7 100644
--- a/src/caosdb/entity.cpp
+++ b/src/caosdb/entity.cpp
@@ -80,6 +80,9 @@ Entity::Entity() : wrapped(Entity::CreateProtoEntity()) {
 Entity::Entity(IdResponse *idResponse) : Entity() {
   this->wrapped->set_id(idResponse->id());
   this->wrapped->mutable_errors()->Swap(idResponse->mutable_entity_errors());
+  this->wrapped->mutable_warnings()->Swap(
+    idResponse->mutable_entity_warnings());
+  this->wrapped->mutable_infos()->Swap(idResponse->mutable_entity_infos());
 }
 
 auto Entity::SetId(const std::string &id) -> void { this->wrapped->set_id(id); }
diff --git a/test/test_entity.cpp b/test/test_entity.cpp
index e34e073f1d0245fe27d1d3d5beb0a72e6aabc048..1f3adf99b0702f7a369e20b42d2f8a3af3ea94dd 100644
--- a/test/test_entity.cpp
+++ b/test/test_entity.cpp
@@ -101,14 +101,14 @@ TEST(test_entity, test_from_id_response) { // NOLINT
 
   Entity other_ent(&idr_warnings_and_infos);
 
-  EXPECT_EQ(entity.GetId(), "other_entity_id");
-  EXPECT_EQ(entity.GetWarnings().Size(), 1);
-  EXPECT_EQ(entity.GetWarnings().At(0).GetDescription(), "warning_desc");
-  EXPECT_EQ(entity.GetWarnings().At(0).GetCode(),
+  EXPECT_EQ(other_ent.GetId(), "other_entity_id");
+  EXPECT_EQ(other_ent.GetWarnings().Size(), 1);
+  EXPECT_EQ(other_ent.GetWarnings().At(0).GetDescription(), "warning_desc");
+  EXPECT_EQ(other_ent.GetWarnings().At(0).GetCode(),
             MessageCode::ENTITY_HAS_NO_PROPERTIES);
-  EXPECT_EQ(entity.GetInfos().Size(), 1);
-  EXPECT_EQ(entity.GetInfos().At(0).GetDescription(), "info_desc");
-  EXPECT_EQ(entity.GetInfos().At(0).GetCode(), MessageCode::UNSPECIFIED);
+  EXPECT_EQ(other_ent.GetInfos().Size(), 1);
+  EXPECT_EQ(other_ent.GetInfos().At(0).GetDescription(), "info_desc");
+  EXPECT_EQ(other_ent.GetInfos().At(0).GetCode(), MessageCode::UNSPECIFIED);
 }
 
 } // namespace caosdb::entity