diff --git a/common.h b/common.h
index e1f27e6..8b1d478 100644
--- a/common.h
+++ b/common.h
@@ -18,7 +18,7 @@
 #define NONCE_SIZE 64
 #define MAX_MSGSIZE 15000
 #define MAX_CHKSUMSIZE 1024
-#define MAX_BUFSIZE (((MAX_MSGSIZE + 2) / 3) * 4) + (((MAX_CHKSUMSIZE + 2) / 3) * 4) + 1536 
+#define MAX_BUFSIZE (((MAX_MSGSIZE + 2) / 3) * 4) + (((MAX_CHKSUMSIZE + 2) / 3) * 4) + 900 
 /* #define MAX_MSGSIZE ((MAX_BUFSIZE - 1536) / 2) - MAX_CHKSUMSIZE //for bin to hex*/
 /* #define MAX_MSGSIZE ((MAX_BUFSIZE - 1536) / 4 * 3) - MAX_CHKSUMSIZE //for base64 */
 
diff --git a/verifier.c b/verifier.c
index 9acf17d..1ada3ba 100644
--- a/verifier.c
+++ b/verifier.c
@@ -74,7 +74,9 @@ int process_verifier(char *buffer) {
     int ret = 0;
     char remote_ip[16];
 
+#ifdef DEBUG
     printf("> VERIFIER: %s\n", buffer);
+#endif
 
     if (0 == strncasecmp("VERIFYMSG", buffer, 9)) {
         ret = verifier_verifymsg(&buffer[10]);
@@ -103,7 +105,9 @@ int process_verifier(char *buffer) {
     }
 
     if (0 == ret) {
+#ifdef DEBUG
         printf("< VERIFIER: %s\n", buffer);
+#endif
     }
     return ret;
 }