diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
index 0347028b7a58146e4766d7060f5f406de699ec82..20d433895c0fafdc20bb8ffe4cba750d85c5c8af 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
@@ -33,6 +33,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 import org.caosdb.server.database.proto.FlatProperty;
 import org.caosdb.server.database.proto.ProtoProperty;
 import org.caosdb.server.database.proto.SparseEntity;
@@ -334,7 +335,7 @@ public class DatabaseUtils {
             pp.collValues
                 .stream()
                 .map((x) -> (Object) ((Entry<Integer, String>) x).getValue())
-                .toList();
+                .collect(Collectors.toList());
       }
       result.add(pp);
     }
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java
index 66bf99c458a7c5dede2c02c506b1e7b82a8b99ef..fa2fb7cb2d9ebab466c9ee1594ba7b19eff2dd52 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java
@@ -28,24 +28,22 @@ import org.caosdb.server.entity.wrapper.Property;
 public class Replacement extends Property {
 
   public Property replacement;
-  public EntityID replacementId;
 
   @Override
   public EntityID getId() {
-    return replacementId;
+    return replacement.getId();
   }
 
   public void setReplacementId(EntityID id) {
-    replacementId.link(id);
+    replacement.getId().link(id);
   }
 
   public Replacement(Property p) {
     super(p);
-    replacementId = new EntityID();
     replacement = new Property(new RetrieveEntity());
 
     replacement.setDomain(p.getDomainEntity());
-    replacement.setId(replacementId);
+    replacement.setId(new EntityID());
     replacement.setStatementStatus(StatementStatus.REPLACEMENT);
     replacement.setValue(new ReferenceValue(p.getId()));
     replacement.setPIdx(0);