diff --git a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java
index b25b4b35182cd39575318bd4df8d760f065bd4dd..716f7e6e20b44daa407c68c7223e4fe2cea96e12 100644
--- a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java
@@ -163,7 +163,7 @@ public class HostLookupMessage extends I2CPMessageImpl {
             _sessionId.writeBytes(os);
             DataHelper.writeLong(os, 4, _reqID);
             DataHelper.writeLong(os, 4, _timeout);
-            DataHelper.writeLong(os, 1, _lookupType);
+            os.write((byte) _lookupType);
             if (_lookupType == LOOKUP_HASH) {
                 _hash.writeBytes(os);
             } else {
diff --git a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java
index 8f0c3bfc0b6de55cfca9fb6244481688763b88cd..415c4c6efa3460594023c32aab9a653825a9337b 100644
--- a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java
@@ -139,7 +139,7 @@ public class HostReplyMessage extends I2CPMessageImpl {
         try {
             _sessionId.writeBytes(os);
             DataHelper.writeLong(os, 4, _reqID);
-            DataHelper.writeLong(os, 1, _code);
+            os.write((byte) _code);
             if (_code == RESULT_SUCCESS)
                 _dest.writeBytes(os);
         } catch (DataFormatException dfe) {
diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java
index 49224d1120a2bbac8b8a636e2f41260dc37c1d7e..88c78ca0af60f3317c19d44fc4533291f4fdeff4 100644
--- a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java
+++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java
@@ -112,6 +112,8 @@ public class I2CPMessageHandler {
             return new HostReplyMessage();
         case CreateLeaseSet2Message.MESSAGE_TYPE:
             return new CreateLeaseSet2Message();
+        case BlindingInfoMessage.MESSAGE_TYPE:
+            return new BlindingInfoMessage();
         default:
             throw new I2CPMessageException("The type " + type + " is an unknown I2CP message");
         }
diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
index dfd6ad654a7d8be78e594d613ee6e0f12a00d7dd..8aca349f629ba306fa168c07121febee010d651c 100644
--- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
@@ -122,7 +122,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
         ByteArrayOutputStream os = new ByteArrayOutputStream(256);
         try {
             _sessionId.writeBytes(os);
-            DataHelper.writeLong(os, 1, _endpoints.size());
+            os.write((byte) _endpoints.size());
             for (int i = 0; i < _endpoints.size(); i++) {
                 Hash router = getRouter(i);
                 router.writeBytes(os);
diff --git a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
index 39213369d39e56c9ef55397d3072b75282877e28..beb3ad93b22c459b3a6f3868f33527c046bdf2fb 100644
--- a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
@@ -112,7 +112,7 @@ public class RequestVariableLeaseSetMessage extends I2CPMessageImpl {
         ByteArrayOutputStream os = new ByteArrayOutputStream(256);
         try {
             _sessionId.writeBytes(os);
-            DataHelper.writeLong(os, 1, _endpoints.size());
+            os.write((byte) _endpoints.size());
             for (int i = 0; i < _endpoints.size(); i++) {
                 _endpoints.get(i).writeBytes(os);
             }
diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
index 2ccdea12c578e2accadd540da56735878b20ab71..ea135f7927159854d452252f2f96a9c3fff09eba 100644
--- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
@@ -85,7 +85,7 @@ public class SessionStatusMessage extends I2CPMessageImpl {
         ByteArrayOutputStream os = new ByteArrayOutputStream(64);
         try {
             _sessionId.writeBytes(os);
-            DataHelper.writeLong(os, 1, _status);
+            os.write((byte) _status);
         } catch (DataFormatException dfe) {
             throw new I2CPMessageException("Error writing out the message data", dfe);
         }