diff --git a/dap_dns_server.c b/dap_dns_server.c
index 579971a4978e7c47d18941b3eb85ae18e0202e8e..60e657e652860184a07e9bbe0aa5b6995b9d0df3 100755
--- a/dap_dns_server.c
+++ b/dap_dns_server.c
@@ -274,7 +274,7 @@ void dap_dns_client_read(dap_client_remote_t *client, void * arg) {
     // Compose DNS answer
         block_len = DNS_ANSWER_SIZE;
         dns_reply->data = DAP_REALLOC(dns_reply->data, dns_reply->ptr + block_len);
-        val = 0xc000 || DNS_HEADER_SIZE;                // Link to host name
+        val = 0xc000 | DNS_HEADER_SIZE;                // Link to host name
         dap_dns_buf_put_uint16(dns_reply, val);
         val = DNS_RECORD_TYPE_A;
         dap_dns_buf_put_uint16(dns_reply, val);
diff --git a/dap_udp_server.c b/dap_udp_server.c
old mode 100755
new mode 100644
index e509ef95f4b8ac15cf3add37b57301a0d6a55e23..9469474ec03d162f0db6cb04c6ae64d52682f0ad
--- a/dap_udp_server.c
+++ b/dap_udp_server.c
@@ -205,7 +205,7 @@ static void write_cb( EPOLL_HANDLE efd, int revents, dap_server_t *sh )
           total_sent += bytes_sent;
         }
         client->buf_out_size = 0;
-        memset( client->buf_out, 0, DAP_CLIENT_REMOTE_BUF + 1 );
+        memset( client->buf_out, 0, sizeof(client->buf_out) );
         client->flags &= ~DAP_SOCK_READY_TO_WRITE;
         sb_payload_ready = false;
       }
@@ -310,7 +310,7 @@ static void read_cb( EPOLL_HANDLE efd, int revents, dap_server_t *sh )
         }
 
         client->buf_in_size = 0;
-        memset( client->buf_in, 0, DAP_CLIENT_REMOTE_BUF + 1 );
+        memset( client->buf_in, 0, sizeof(client->buf_out) );
 
         pthread_mutex_unlock( &udp_client->mutex_on_client );