diff --git a/lib/core/src/chain_swap.rs b/lib/core/src/chain_swap.rs
index fce9642f5..36d816735 100644
--- a/lib/core/src/chain_swap.rs
+++ b/lib/core/src/chain_swap.rs
@@ -749,7 +749,7 @@ impl ChainSwapHandler {
         Ok(())
     }
 
-    pub async fn prepare_refund(
+    pub(crate) async fn prepare_refund(
         &self,
         lockup_address: &str,
         refund_address: &str,
@@ -759,7 +759,7 @@ impl ChainSwapHandler {
             .persister
             .fetch_chain_swap_by_lockup_address(lockup_address)?
             .ok_or(SdkError::Generic {
-                err: format!("Swap {} not found", lockup_address),
+                err: format!("Swap for lockup address {} not found", lockup_address),
             })?;
 
         let refund_tx_id = swap.refund_tx_id.clone();
@@ -790,7 +790,7 @@ impl ChainSwapHandler {
             .persister
             .fetch_chain_swap_by_lockup_address(lockup_address)?
             .ok_or(PaymentError::Generic {
-                err: format!("Swap {} not found", lockup_address),
+                err: format!("Swap for lockup address {} not found", lockup_address),
             })?;
 
         ensure_sdk!(
diff --git a/lib/core/src/swapper/boltz/bitcoin.rs b/lib/core/src/swapper/boltz/bitcoin.rs
index 468bcc4a3..625f1da54 100644
--- a/lib/core/src/swapper/boltz/bitcoin.rs
+++ b/lib/core/src/swapper/boltz/bitcoin.rs
@@ -25,6 +25,7 @@ impl BoltzSwapper {
             Swap::Chain(swap) => match swap.direction {
                 Direction::Incoming => {
                     let swap_script = swap.get_lockup_swap_script()?;
+                    // TODO Update boltz-client to build refund tx with all utxos
                     BtcSwapTx::new_refund(
                         swap_script.as_bitcoin_script()?,
                         refund_address,