diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java
index 6c61e09597702bab9e21a923d6b8533836b2a90f..25baa879cabcebdab39d5b6912f64bd95d8c5df2 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java
@@ -40,7 +40,7 @@ public class SOCKSHeader {
             throw new IllegalArgumentException("Header too short: " + data.length);
 
         this.header = new byte[headerlen];
-        System.arraycopy(this.header, 0, data, 0, headerlen);
+        System.arraycopy(data, 0, this.header, 0, headerlen);
     }
     
     private static final byte[] beg = {0,0,0,3,60};
@@ -53,10 +53,10 @@ public class SOCKSHeader {
      */
     public SOCKSHeader(Destination dest) {
         this.header = new byte[beg.length + 60 + end.length];
-        System.arraycopy(this.header, 0, beg, 0, beg.length);
+        System.arraycopy(beg, 0, this.header, 0, beg.length);
         String b32 = dest.toBase32();
-        System.arraycopy(this.header, beg.length, DataHelper.getASCII(b32), 0, 60);
-        System.arraycopy(this.header, beg.length + 60, end, 0, end.length);
+        System.arraycopy(DataHelper.getASCII(b32), 0, this.header, beg.length, 60);
+        System.arraycopy(end, 0, this.header, beg.length + 60, end.length);
     }
     
     public String getHost() {
@@ -65,7 +65,7 @@ public class SOCKSHeader {
             return null;
         int namelen = (this.header[4] & 0xff);
         byte[] nameBytes = new byte[namelen];
-        System.arraycopy(nameBytes, 0, this.header, 5, namelen);
+        System.arraycopy(this.header, 5, nameBytes, 0, namelen);
         return DataHelper.getUTF8(nameBytes);
     }
 
diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt
index 43212a8e30ea22b5f070312032989cbfbc29ee62..ef420c37647fdc59933657272388604b9ce9d2d3 100644
--- a/installer/resources/deletelist.txt
+++ b/installer/resources/deletelist.txt
@@ -96,3 +96,4 @@ certificates/ssl/jp.reseed.i2p2.no.crt
 certificates/ssl/ieb9oopo.mooo.com2.crt
 certificates/ssl/netdb.i2p2.no2.crt
 certificates/ssl/i2p.mooo.com2.crt
+certificates/ssl/ieb9oopo.mooo.com.crt
diff --git a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
index 0fd9c83af9fe22b56f30af5658045b8fa836f822..075eb04b982278a2719c2621d22a943fec1d609a 100644
--- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
@@ -132,11 +132,8 @@ class EstablishmentManager {
      * but i2pd hasn't recognized it until this release.
      * No matter, the options weren't defined until this release anyway.
      *
-**********************************************************************************************************
-     * FIXME 0.9.23 for testing, change to 0.9.24 for release
-     *
      */
-    private static final String VERSION_ALLOW_EXTENDED_OPTIONS = "0.9.23";
+    private static final String VERSION_ALLOW_EXTENDED_OPTIONS = "0.9.24";
     private static final String PROP_DISABLE_EXT_OPTS = "i2np.udp.disableExtendedOptions";