diff --git a/main/client/src/main/java/org/elasticsoftware/akces/client/AkcesClientController.java b/main/client/src/main/java/org/elasticsoftware/akces/client/AkcesClientController.java
index b7e89402..53b6c91b 100644
--- a/main/client/src/main/java/org/elasticsoftware/akces/client/AkcesClientController.java
+++ b/main/client/src/main/java/org/elasticsoftware/akces/client/AkcesClientController.java
@@ -17,6 +17,8 @@
 
 package org.elasticsoftware.akces.client;
 
+import module java.base;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
@@ -69,11 +71,6 @@
 import org.springframework.kafka.core.KafkaAdminOperations;
 import org.springframework.kafka.core.ProducerFactory;
 
-import java.io.IOException;
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.singletonList;
 import static org.elasticsoftware.akces.client.AkcesClientControllerState.*;
diff --git a/main/client/src/main/java/org/elasticsoftware/akces/client/CommandSendingFailedException.java b/main/client/src/main/java/org/elasticsoftware/akces/client/CommandSendingFailedException.java
index a3159395..cb57d3e6 100644
--- a/main/client/src/main/java/org/elasticsoftware/akces/client/CommandSendingFailedException.java
+++ b/main/client/src/main/java/org/elasticsoftware/akces/client/CommandSendingFailedException.java
@@ -23,6 +23,7 @@
 
 public class CommandSendingFailedException extends AkcesClientCommandException {
     public CommandSendingFailedException(@Nonnull Class<? extends Command> commandClass, @Nonnull Throwable cause) {
-        super(commandClass, commandClass.getAnnotation(CommandInfo.class), "Sending", cause);
+        CommandInfo commandInfo = commandClass.getAnnotation(CommandInfo.class);
+        super(commandClass, commandInfo, "Sending", cause);
     }
 }
diff --git a/main/eventcatalog/src/main/java/org/elasticsoftware/akces/eventcatalog/EventCatalogProcessor.java b/main/eventcatalog/src/main/java/org/elasticsoftware/akces/eventcatalog/EventCatalogProcessor.java
index 60e67f7b..27df5830 100644
--- a/main/eventcatalog/src/main/java/org/elasticsoftware/akces/eventcatalog/EventCatalogProcessor.java
+++ b/main/eventcatalog/src/main/java/org/elasticsoftware/akces/eventcatalog/EventCatalogProcessor.java
@@ -17,6 +17,8 @@
 
 package org.elasticsoftware.akces.eventcatalog;
 
+import module java.base;
+
 import com.google.auto.service.AutoService;
 import org.elasticsoftware.akces.annotations.*;
 
@@ -28,10 +30,6 @@
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.*;
-import java.util.stream.Stream;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/main/query-support/src/main/java/org/elasticsoftware/akces/query/database/AkcesDatabaseModelController.java b/main/query-support/src/main/java/org/elasticsoftware/akces/query/database/AkcesDatabaseModelController.java
index 74a99e74..f7e0c1d5 100644
--- a/main/query-support/src/main/java/org/elasticsoftware/akces/query/database/AkcesDatabaseModelController.java
+++ b/main/query-support/src/main/java/org/elasticsoftware/akces/query/database/AkcesDatabaseModelController.java
@@ -17,6 +17,8 @@
 
 package org.elasticsoftware.akces.query.database;
 
+import module java.base;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Nonnull;
 import org.apache.kafka.clients.consumer.Consumer;
@@ -51,10 +53,6 @@
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-
 import static org.elasticsoftware.akces.query.database.AkcesDatabaseModelControllerState.*;
 
 public class AkcesDatabaseModelController extends Thread implements AutoCloseable, ConsumerRebalanceListener, ApplicationContextAware, AkcesRegistry {
diff --git a/main/query-support/src/main/java/org/elasticsoftware/akces/query/models/AkcesQueryModelController.java b/main/query-support/src/main/java/org/elasticsoftware/akces/query/models/AkcesQueryModelController.java
index fe5af3f2..d75cf645 100644
--- a/main/query-support/src/main/java/org/elasticsoftware/akces/query/models/AkcesQueryModelController.java
+++ b/main/query-support/src/main/java/org/elasticsoftware/akces/query/models/AkcesQueryModelController.java
@@ -17,6 +17,8 @@
 
 package org.elasticsoftware.akces.query.models;
 
+import module java.base;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.benmanes.caffeine.cache.Cache;
@@ -56,14 +58,6 @@
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.kafka.core.KafkaAdminOperations;
 
-import java.io.IOException;
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.elasticsoftware.akces.query.models.AkcesQueryModelControllerState.*;
 import static org.elasticsoftware.akces.util.KafkaUtils.getIndexTopicName;
diff --git a/main/runtime/src/main/java/org/elasticsoftware/akces/AkcesAggregateController.java b/main/runtime/src/main/java/org/elasticsoftware/akces/AkcesAggregateController.java
index 0f3fbdaf..98684844 100644
--- a/main/runtime/src/main/java/org/elasticsoftware/akces/AkcesAggregateController.java
+++ b/main/runtime/src/main/java/org/elasticsoftware/akces/AkcesAggregateController.java
@@ -17,6 +17,8 @@
 
 package org.elasticsoftware.akces;
 
+import module java.base;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
@@ -66,12 +68,6 @@
 import org.springframework.kafka.core.ProducerFactory;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.BiFunction;
-import java.util.stream.IntStream;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.elasticsoftware.akces.AkcesControllerState.*;
 import static org.elasticsoftware.akces.gdpr.GDPRAnnotationUtils.hasPIIDataAnnotation;
diff --git a/test-apps/crypto-trading/aggregates/src/main/java/org/elasticsoftware/cryptotrading/aggregates/wallet/Wallet.java b/test-apps/crypto-trading/aggregates/src/main/java/org/elasticsoftware/cryptotrading/aggregates/wallet/Wallet.java
index 6be0fa8d..26f19e5a 100644
--- a/test-apps/crypto-trading/aggregates/src/main/java/org/elasticsoftware/cryptotrading/aggregates/wallet/Wallet.java
+++ b/test-apps/crypto-trading/aggregates/src/main/java/org/elasticsoftware/cryptotrading/aggregates/wallet/Wallet.java
@@ -236,7 +236,7 @@ public Stream<DomainEvent> cancelReservation(CancelReservationCommand command, W
         return new WalletStateV2(state.id(), state.balances().stream().map(b -> {
             if (b.currency().equals(event.currency())) {
                 List<WalletStateV2.Reservation> reservations = new ArrayList<>(b.reservations());
-                reservations.add(new WalletStateV2.Reservation(event.referenceId(), b.amount()));
+                reservations.add(new WalletStateV2.Reservation(event.referenceId(), event.amount()));
                 return new WalletStateV2.Balance(b.currency(), b.amount(), reservations);
             } else {
                 return b;