diff --git a/core/src/main/java/bisq/core/dao/state/model/blockchain/TxOutput.java b/core/src/main/java/bisq/core/dao/state/model/blockchain/TxOutput.java
index d35956e7e68..566216314ef 100644
--- a/core/src/main/java/bisq/core/dao/state/model/blockchain/TxOutput.java
+++ b/core/src/main/java/bisq/core/dao/state/model/blockchain/TxOutput.java
@@ -25,7 +25,6 @@
 import java.util.Objects;
 
 import lombok.Getter;
-import lombok.Setter;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -38,7 +37,6 @@
  */
 @Immutable
 @Getter
-@Setter
 public class TxOutput extends BaseTxOutput implements PersistablePayload, ImmutableDaoStateModel {
     public static TxOutput fromTempOutput(TempTxOutput tempTxOutput) {
         return new TxOutput(tempTxOutput.getIndex(),
diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryRequest.java b/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryRequest.java
index 125730e9125..a8cbde00612 100644
--- a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryRequest.java
+++ b/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryRequest.java
@@ -21,11 +21,11 @@
 import bisq.common.app.Version;
 import bisq.common.proto.network.NetworkEnvelope;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.Getter;
+import lombok.ToString;
 
-@Value
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@ToString
 public class GetInventoryRequest extends NetworkEnvelope {
     private final String version;
 
diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryResponse.java b/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryResponse.java
index 4abf04c2045..47a64fead4c 100644
--- a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryResponse.java
+++ b/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryResponse.java
@@ -28,11 +28,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.Getter;
+import lombok.ToString;
 
-@Value
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@ToString
 public class GetInventoryResponse extends NetworkEnvelope {
     private final Map<InventoryItem, String> inventory;