diff --git a/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java b/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
index 3b228a8028..3784268e3f 100644
--- a/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
+++ b/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
@@ -133,6 +133,10 @@ class AddressBasedCoinSelector extends DefaultCoinSelector {
         if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isSentToP2SH
                 ()) {
             Address addressOutput = transactionOutput.getScriptPubKey().getToAddress(params);
+            log.trace("matchesRequiredAddress?");
+            log.trace(addressOutput.toString());
+            log.trace(addressEntry.getAddress().toString());
+
             if (addressEntry != null && addressOutput.equals(addressEntry.getAddress())) {
                 return true;
             }
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
index 1982e82a86..7b144fb9e0 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
@@ -123,8 +123,9 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
         selectedItemChangeListener = (obsValue, oldValue, newValue) -> {
             if (oldValue != null && newValue != null)
                 presentationModel.selectTrade(newValue);
-            else if (newValue == null)
-                table.getSelectionModel().clearSelection();
+            // TODO only clearSelection when there are more at least one remaining trades
+           /* else if (newValue == null)
+                table.getSelectionModel().clearSelection();*/
         };
 
         listChangeListener = change -> {
diff --git a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java
index 5f5684583f..232d40d8d9 100644
--- a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java
+++ b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java
@@ -282,6 +282,10 @@ public class BootstrappedPeerFactory {
 
     private void bootstrapWithRelay(PeerDHT peerDHT) {
 
+        PeerAddress upa = peerDHT.peerBean().serverPeerAddress();
+        upa = upa.changeFirewalledTCP(true).changeFirewalledUDP(true);
+        peerDHT.peerBean().serverPeerAddress(upa);
+        
         PeerNAT peerNAT = new PeerBuilderNAT(peerDHT.peer()).start();
         FutureRelayNAT futureRelayNAT = peerNAT.startRelay(getBootstrapAddress());
 
diff --git a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java
index 75b7f05c28..c572d564f1 100644
--- a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java
+++ b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java
@@ -57,8 +57,8 @@ public class SeedNodeAddress {
     public enum StaticSeedNodeAddresses {
         // Manfreds server: "188.226.179.109"
         // Steves server: "128.199.251.106"
-        DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000),
-        DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000);
+        DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000);
+        // DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000);
         //LOCALHOST("localhost", "127.0.0.1", 5000);
 
         private final String id;