diff --git a/swap/src/alice/execution.rs b/swap/src/alice/execution.rs
index e3e718fe..76b05a5a 100644
--- a/swap/src/alice/execution.rs
+++ b/swap/src/alice/execution.rs
@@ -13,7 +13,7 @@ use libp2p::request_response::ResponseChannel;
 use sha2::Sha256;
 use std::{sync::Arc, time::Duration};
 use tokio::time::timeout;
-use tracing::trace;
+use tracing::{info, trace};
 use xmr_btc::{
     alice,
     alice::State3,
@@ -183,6 +183,7 @@ pub async fn publish_bitcoin_redeem_transaction<W>(
 where
     W: BroadcastSignedTransaction + WaitForTransactionFinality,
 {
+    info!("Attempting to publish bitcoin redeem txn");
     let tx_id = bitcoin_wallet
         .broadcast_signed_transaction(redeem_tx)
         .await?;
diff --git a/swap/src/bob/swap.rs b/swap/src/bob/swap.rs
index a517ca94..35c3c3be 100644
--- a/swap/src/bob/swap.rs
+++ b/swap/src/bob/swap.rs
@@ -271,22 +271,10 @@ where
                 // }
                 Ok(BobState::BtcRefunded)
             }
-            BobState::BtcRefunded => {
-                info!("btc refunded");
-                Ok(BobState::BtcRefunded)
-            }
-            BobState::Punished => {
-                info!("punished");
-                Ok(BobState::Punished)
-            }
-            BobState::SafelyAborted => {
-                info!("safely aborted");
-                Ok(BobState::SafelyAborted)
-            }
-            BobState::XmrRedeemed => {
-                info!("xmr redeemed");
-                Ok(BobState::XmrRedeemed)
-            }
+            BobState::BtcRefunded => Ok(BobState::BtcRefunded),
+            BobState::Punished => Ok(BobState::Punished),
+            BobState::SafelyAborted => Ok(BobState::SafelyAborted),
+            BobState::XmrRedeemed => Ok(BobState::XmrRedeemed),
         }
     }
 }
diff --git a/swap/src/lib.rs b/swap/src/lib.rs
index 68fb45c4..d435e893 100644
--- a/swap/src/lib.rs
+++ b/swap/src/lib.rs
@@ -14,8 +14,8 @@ pub mod state;
 pub mod storage;
 pub mod tor;
 
-pub const REFUND_TIMELOCK: u32 = 10; // Relative timelock, this is number of blocks. TODO: What should it be?
-pub const PUNISH_TIMELOCK: u32 = 10; // FIXME: What should this be?
+pub const REFUND_TIMELOCK: u32 = 50; // Relative timelock, this is number of blocks. TODO: What should it be?
+pub const PUNISH_TIMELOCK: u32 = 50; // FIXME: What should this be?
 
 pub type Never = std::convert::Infallible;
 
diff --git a/swap/tests/e2e.rs b/swap/tests/e2e.rs
index f1886c91..9dd35589 100644
--- a/swap/tests/e2e.rs
+++ b/swap/tests/e2e.rs
@@ -10,7 +10,6 @@ use swap::{
 };
 use tempfile::tempdir;
 use testcontainers::clients::Cli;
-use tracing_subscriber::util::SubscriberInitExt as _;
 use uuid::Uuid;
 use xmr_btc::{alice::State0, bitcoin, config::Config, cross_curve_dleq};