diff --git a/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
index 689ad265c10..55ed89d1608 100644
--- a/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
+++ b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
@@ -14,7 +14,7 @@ public CheckNumberOfUnconfirmedTransactions(TaskRunner<PlaceOfferModel> taskHand
     @Override
     protected void run() {
         if (model.getWalletService().isUnconfirmedTransactionsLimitHit() || model.getBsqWalletService().isUnconfirmedTransactionsLimitHit())
-            failed(Res.get("shared.unconfirmedTransactionsLimitReached"));
+            return failed(Res.get("shared.unconfirmedTransactionsLimitReached"));
         complete();
     }
 }
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
index 1c07723850d..8ae7ec1cb24 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
@@ -917,7 +917,7 @@ private long getTradeStartTime() {
         long now = System.currentTimeMillis();
         long startTime;
         Transaction depositTx = getDepositTx();
-        if (depositTx != null && getDate() != null) {
+        if (depositTx != null) {
             if (depositTx.getConfidence().getDepthInBlocks() > 0) {
                 final long tradeTime = getDate().getTime();
                 // Use tx.getIncludedInBestChainAt() when available, otherwise use tx.getUpdateTime()
diff --git a/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapBuyerAsMakerTrade.java b/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapBuyerAsMakerTrade.java
index 7fbf26eb47a..ab57a2b7274 100644
--- a/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapBuyerAsMakerTrade.java
+++ b/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapBuyerAsMakerTrade.java
@@ -18,7 +18,7 @@
 package bisq.core.trade.model.bsq_swap;
 
 import bisq.core.offer.Offer;
-import bisq.core.trade.model.TakerTrade;
+import bisq.core.trade.model.MakerTrade;
 import bisq.core.trade.model.Tradable;
 import bisq.core.trade.protocol.bsq_swap.model.BsqSwapProtocolModel;
 
@@ -35,7 +35,7 @@
 import javax.annotation.Nullable;
 
 @Slf4j
-public final class BsqSwapBuyerAsMakerTrade extends BsqSwapBuyerTrade implements TakerTrade {
+public final class BsqSwapBuyerAsMakerTrade extends BsqSwapBuyerTrade implements MakerTrade {
     public BsqSwapBuyerAsMakerTrade(Offer offer,
                                     Coin amount,
                                     long takeOfferDate,