diff --git a/history.txt b/history.txt
index f6774f0a1..f2ad806ad 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,10 @@
+2022-03-04 zzz
+ * Console: Add SSU version column to /peers
+ * i2psnark: Add js theme preview
+ * i2psnark standalone: Add more CLI messages, increase memory
+ * NTCP: Fix port selection when SSU disabled
+ * Transport: Fix wasUnreachable() for transports with alt style
+
 2022-03-03 zzz
  * NetDB: Load reseed RI if newer than in-memory
  * NTCP: Start out reachable if SSU disabled
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 2d30a2c12..35ab2b80b 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Git";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 3;
+    public final static long BUILD = 4;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index 273f3b95f..415e7b9e2 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -68,8 +68,8 @@ public abstract class TransportImpl implements Transport {
     /** global router ident -> IP */
     private static final Map<Hash, byte[]> _IPMap;
 
-    private static final long UNREACHABLE_PERIOD = 5*60*1000;
-    private static final long WAS_UNREACHABLE_PERIOD = 30*60*1000;
+    private final long UNREACHABLE_PERIOD;
+    private final long WAS_UNREACHABLE_PERIOD;
 
     /** @since 0.9.50 */
     public static final String CAP_IPV4 = "4";
@@ -120,6 +120,16 @@ public abstract class TransportImpl implements Transport {
         _unreachableEntries = new ConcurrentHashMap<Hash, Long>(32);
         _wasUnreachableEntries = new ConcurrentHashMap<Hash, Long>(32);
         _localAddresses = new ConcurrentHashSet<InetAddress>(4);
+        if (allowLocal()) {
+            // don't ban for a long time in testnet, or else
+            // everybody is excluded by ProfileOrganizer.selectPeersLocallyUnreachable()
+            // at startup for half an hour
+            UNREACHABLE_PERIOD = 60*1000;
+            WAS_UNREACHABLE_PERIOD = 60*1000;
+        } else {
+            UNREACHABLE_PERIOD = 5*60*1000;
+            WAS_UNREACHABLE_PERIOD = 30*60*1000;
+        }
         _context.simpleTimer2().addPeriodicEvent(new CleanupUnreachable(), 2 * UNREACHABLE_PERIOD, UNREACHABLE_PERIOD / 2);
         // if the router is slow, or we have the i2prouter script on linux that bumps the ulimit,
         // allow more NTCP2 and less SSU. See getMaxConnections() below.
@@ -922,14 +932,16 @@ public abstract class TransportImpl implements Transport {
     private class CleanupUnreachable implements SimpleTimer.TimedEvent {
         public void timeReached() {
             long now = _context.clock().now();
+            long limit = now - UNREACHABLE_PERIOD;
             for (Iterator<Long> iter = _unreachableEntries.values().iterator(); iter.hasNext(); ) {
                 Long when = iter.next();
-                if (when.longValue() + UNREACHABLE_PERIOD < now)
+                if (when.longValue() < limit)
                     iter.remove();
             }
+            limit = now - WAS_UNREACHABLE_PERIOD;
             for (Iterator<Long> iter = _wasUnreachableEntries.values().iterator(); iter.hasNext(); ) {
                 Long when = iter.next();
-                if (when.longValue() + WAS_UNREACHABLE_PERIOD < now)
+                if (when.longValue() < limit)
                     iter.remove();
             }
         }
@@ -953,7 +965,14 @@ public abstract class TransportImpl implements Transport {
         RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer);
         if (ri == null)
             return false;
-        return null == ri.getTargetAddress(this.getStyle());
+        String alt = getAltStyle();
+        if (alt != null) {
+            List<RouterAddress> addrs = ri.getTargetAddresses(getStyle(), alt);
+            return addrs.isEmpty();
+        } else {
+            RouterAddress addr = ri.getTargetAddress(getStyle());
+            return addr == null;
+        }
     }
 
     /**