diff --git a/dist/antd-publishers-0.1.0a.tar.gz b/dist/antd-publishers-0.1.0a.tar.gz
index d032192..6d3fddd 100644
Binary files a/dist/antd-publishers-0.1.0a.tar.gz and b/dist/antd-publishers-0.1.0a.tar.gz differ
diff --git a/tunnel.c b/tunnel.c
index 6b465df..4c55afc 100644
--- a/tunnel.c
+++ b/tunnel.c
@@ -12,9 +12,9 @@
 #define MODULE_NAME "api"
 
 
-static int msg_check_number(int fd, int number)
+static int msg_check_number(int fd, uint16_t number)
 {
-    int value;
+    uint16_t value;
     if(read(fd,&value,sizeof(value)) == -1)
     {
         M_ERROR(MODULE_NAME, "Unable to read integer value: %s", strerror(errno));
@@ -48,7 +48,7 @@ static int msg_read_string(int fd, char* buffer, uint8_t max_length)
     return 0;
 }
 
-static uint8_t* msg_read_payload(int fd, int* size)
+static uint8_t* msg_read_payload(int fd, uint16_t* size)
 {
     uint8_t* data;
     if(read(fd,size,sizeof(*size)) == -1)
@@ -101,13 +101,11 @@ int open_unix_socket(char* path)
 
 int msg_read(int fd, tunnel_msg_t* msg)
 {
-#ifdef VERIFY_HEADER
     if(msg_check_number(fd, MSG_MAGIC_BEGIN) == -1)
     {
         M_ERROR(MODULE_NAME, "Unable to check begin magic number");
         return -1;
     }
-#endif
     if(read(fd,&msg->header.type,sizeof(msg->header.type)) == -1)
     {
         M_ERROR(MODULE_NAME, "Unable to read msg type: %s", strerror(errno));
@@ -133,7 +131,6 @@ int msg_read(int fd, tunnel_msg_t* msg)
         M_ERROR(MODULE_NAME, "Unable to read msg payload data");
         return -1;
     }
-#ifdef VERIFY_HEADER
     if(msg_check_number(fd, MSG_MAGIC_END) == -1)
     {
         if(msg->data)
@@ -143,21 +140,18 @@ int msg_read(int fd, tunnel_msg_t* msg)
         M_ERROR(MODULE_NAME, "Unable to check end magic number");
         return -1;
     }
-#endif
     return 0;
 }
 
 int msg_write(int fd, tunnel_msg_t* msg)
 {
-#ifdef VERIFY_HEADER
     // write begin magic number
-    int number = MSG_MAGIC_BEGIN;
+    uint16_t number = MSG_MAGIC_BEGIN;
     if(write(fd,&number, sizeof(number)) == -1)
     {
         M_ERROR(MODULE_NAME, "Unable to write begin magic number: %s", strerror(errno));
         return -1;
     }
-#endif
     // write type
     if(write(fd,&msg->header.type, sizeof(msg->header.type)) == -1)
     {
@@ -192,13 +186,11 @@ int msg_write(int fd, tunnel_msg_t* msg)
             return -1;
         }
     }
-#ifdef VERIFY_HEADER
     number = MSG_MAGIC_END;
     if(write(fd,&number, sizeof(number)) == -1)
     {
         M_ERROR(MODULE_NAME, "Unable to write end magic number: %s", strerror(errno));
         return -1;
     }
-#endif
     return 0;
 }
\ No newline at end of file
diff --git a/tunnel.h b/tunnel.h
index b6896e3..1449666 100644
--- a/tunnel.h
+++ b/tunnel.h
@@ -6,10 +6,8 @@
 #define MAX_CHANNEL_PATH            108
 #define MAX_CHANNEL_NAME            64
 
-#ifdef VERIFY_HEADER
-#define MSG_MAGIC_BEGIN             0x414e5444 //ANTD
-#define MSG_MAGIC_END               0x44544e41 //DTNA
-#endif
+#define MSG_MAGIC_BEGIN             (uint16_t)0x414e //AN
+#define MSG_MAGIC_END               (uint16_t)0x5444 //TD
 
 #define    CHANNEL_OK               (uint8_t)0x0
 #define    CHANNEL_ERROR            (uint8_t)0x1
@@ -22,9 +20,9 @@
 
 typedef struct {
     uint8_t type;
-    int channel_id;
-    int client_id;
-    int size;
+    uint16_t channel_id;
+    uint16_t client_id;
+    uint16_t size;
 } tunnel_msg_h_t;
 
 typedef struct{