diff --git a/drongo b/drongo
index 6bd3d803..6aca78ca 160000
--- a/drongo
+++ b/drongo
@@ -1 +1 @@
-Subproject commit 6bd3d803037f5cf00ece1d4615b071c4fc98fe9f
+Subproject commit 6aca78cade1ce6d2eb2455b5cfbf1fb873e003dc
diff --git a/lark b/lark
index 10e8d9cd..7e04adda 160000
--- a/lark
+++ b/lark
@@ -1 +1 @@
-Subproject commit 10e8d9cd4bbe9fde4dd93c059e2a9faeec6be3e0
+Subproject commit 7e04adda357e685f679213913fb2559c58a22dcc
diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java
index eccfb4a9..edc302ca 100644
--- a/src/main/java/com/sparrowwallet/sparrow/AppController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java
@@ -1911,11 +1911,6 @@ public class AppController implements Initializable {
     }
 
     private void addTransactionTab(String name, File file, PSBT psbt) {
-        //Convert to PSBTv0 first as the consistent internal representation
-        if(psbt.getVersion() != null && psbt.getVersion() >= 2) {
-            psbt.convertVersion(0);
-        }
-
         //Add any missing previous outputs if available in open wallets
         for(PSBTInput psbtInput : psbt.getPsbtInputs()) {
             if(psbtInput.getUtxo() == null) {
@@ -2565,7 +2560,7 @@ public class AppController implements Initializable {
             if(event instanceof TransactionTabSelectedEvent) {
                 TransactionTabSelectedEvent txTabEvent = (TransactionTabSelectedEvent)event;
                 TransactionTabData transactionTabData = txTabEvent.getTransactionTabData();
-                if(transactionTabData.getPsbt() == null || transactionTabData.getPsbt().getTransaction() != transactionTabData.getTransaction()) {
+                if(transactionTabData.getPsbt() == null || !transactionTabData.getPsbt().getTransaction().getTxId().equals(transactionTabData.getTransaction().getTxId())) {
                     saveTransaction.setVisible(true);
                     saveTransaction.setDisable(false);
                 } else {
diff --git a/src/main/java/com/sparrowwallet/sparrow/payjoin/Payjoin.java b/src/main/java/com/sparrowwallet/sparrow/payjoin/Payjoin.java
index dad575cf..0c2e9bf5 100644
--- a/src/main/java/com/sparrowwallet/sparrow/payjoin/Payjoin.java
+++ b/src/main/java/com/sparrowwallet/sparrow/payjoin/Payjoin.java
@@ -67,7 +67,7 @@ public class Payjoin {
         }
 
         try {
-            String base64Psbt = psbt.getPublicCopy().toBase64String();
+            String base64Psbt = psbt.getForExport().getPublicCopy().toBase64String();
 
             String appendQuery = "v=1&minfeerate=" + AppServices.getMinimumRelayFeeRate();
             int changeOutputIndex = getChangeOutputIndex();