diff --git a/src/proxy.c b/src/proxy.c
index 1cbfc50..4efc464 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -527,7 +527,7 @@ for(;;){
  }
  else if(param->ndatfilterscli > 0 && contentlength64 > 0){
   uint64_t newlen64;
-  newlen64 = sockfillbuffcli(param, (unsigned long)contentlength64, CONNECTION_S);
+  newlen64 = (uint64_t) sockfillbuffcli(param, (unsigned long)contentlength64, CONNECTION_S);
   if(newlen64 == contentlength64) {
 	action = handledatfltcli(param,  &param->clibuf, (int *)&param->clibufsize, 0, (int *)&param->cliinbuf);
 	if(action == HANDLED){
diff --git a/src/proxy.h b/src/proxy.h
index 2c65a40..e96a17e 100644
--- a/src/proxy.h
+++ b/src/proxy.h
@@ -164,8 +164,8 @@ int sockrecvfrom(struct clientparam *param, SOCKET sock, struct sockaddr * sin,
 
 int sockgetcharcli(struct clientparam * param, int timeosec, int timeousec);
 int sockgetcharsrv(struct clientparam * param, int timeosec, int timeousec);
-int sockfillbuffcli(struct clientparam * param, unsigned long size, int timeosec);
-int sockfillbuffsrv(struct clientparam * param, unsigned long size, int timeosec);
+unsigned long sockfillbuffcli(struct clientparam * param, unsigned long size, int timeosec);
+unsigned long sockfillbuffsrv(struct clientparam * param, unsigned long size, int timeosec);
 
 int sockgetlinebuf(struct clientparam * param, DIRECTION which, unsigned char * buf, int bufsize, int delim, int to);
 
diff --git a/src/sockgetchar.c b/src/sockgetchar.c
index a1304ac..3f715b2 100644
--- a/src/sockgetchar.c
+++ b/src/sockgetchar.c
@@ -87,7 +87,7 @@ int sockgetcharcli(struct clientparam * param, int timeosec, int timeousec){
 	return (int)*param->clibuf;
 }
 
-int sockfillbuffcli(struct clientparam * param, unsigned long size, int timeosec){
+unsigned long sockfillbuffcli(struct clientparam * param, unsigned long size, int timeosec){
 	int len;
 
 	if(!param->clibuf) return 0;
@@ -107,7 +107,7 @@ int sockfillbuffcli(struct clientparam * param, unsigned long size, int timeosec
 	return param->cliinbuf;
 }
 
-int sockfillbuffsrv(struct clientparam * param, unsigned long size, int timeosec){
+unsigned long sockfillbuffsrv(struct clientparam * param, unsigned long size, int timeosec){
 	int len;
 
 	if(!param->srvbuf) return 0;
diff --git a/src/tlspr.c b/src/tlspr.c
index 8300470..c44402d 100644
--- a/src/tlspr.c
+++ b/src/tlspr.c
@@ -70,7 +70,7 @@ int parsehello(int type, unsigned char *hello, unsigned len, char *sni, int * sn
     offset += 2;
     if(elen+offset != len) return -9;
     while(elen > 1){
-	int xlen;
+	unsigned xlen;
 	xlen = size16(hello+offset+2);
 	if(xlen+4 > elen) return -10;
 	if(type == 1 && hello[offset] == 0 && hello[offset+1] == 0){
@@ -108,8 +108,8 @@ int parsehello(int type, unsigned char *hello, unsigned len, char *sni, int * sn
     return snifound;
 }
 
-int tlstobufcli(struct clientparam *param, int offset){
-    int len, newlen;
+int tlstobufcli(struct clientparam *param){
+    unsigned long  len, newlen;
     if(!param->clibuf){
 	if(!(param->clibuf = myalloc(SRVBUFSIZE))) return -1;
         param->clibufsize = SRVBUFSIZE;
@@ -135,11 +135,11 @@ int tlstobufcli(struct clientparam *param, int offset){
 	    if(param->cliinbuf <= newlen) return -5;
 	}
     }
-    return len;
+    return (int)len;
 }
 
-int tlstobufsrv(struct clientparam *param, int offset){
-    int len, newlen;
+int tlstobufsrv(struct clientparam *param){
+    unsigned long len, newlen;
 
     if(param->cliinbuf != param->clioffset){
 	len = socksend(param, param->remsock, param->clibuf+param->clioffset,param->cliinbuf-param->clioffset, conf.timeouts[STRING_S]);
@@ -153,20 +153,20 @@ int tlstobufsrv(struct clientparam *param, int offset){
 	param->srvbufsize = SRVBUFSIZE;
 	param->srvoffset = param->srvinbuf = 0;
     }
-    len = sockfillbuffsrv(param, offset+5, conf.timeouts[STRING_S]);
-    if(len < offset+5) return -3;
-    if(param->srvbuf[offset+1] != 3) {
+    len = sockfillbuffsrv(param, 5, conf.timeouts[STRING_S]);
+    if(len < 5) return -3;
+    if(param->srvbuf[1] != 3) {
 	return -4;
     }
     else {
-	len = offset + 5 + size16(param->srvbuf+offset+3);
+	len = 5 + size16(param->srvbuf+3);
 	if(len > param->srvbufsize) return -5;
 	for(newlen=param->srvinbuf; newlen < len; newlen=param->srvinbuf){
 	    sockfillbuffsrv(param, len, conf.timeouts[STRING_S]);
 	    if(param->srvinbuf <= newlen) return -6;
 	}
     }
-    return len-offset;
+    return (int)len;
 }
 
 void * tlsprchild(struct clientparam* param) {
@@ -177,7 +177,7 @@ void * tlsprchild(struct clientparam* param) {
  char proto[PROTOLEN]="-";
  int snipos = 0;
  
- res = tlstobufcli(param, 0);
+ res = tlstobufcli(param);
  if(res <= 0 || param->clibuf[0] != 22){
      if(param->srv->requirecert)RETURN(300-res);
  }
@@ -221,7 +221,7 @@ void * tlsprchild(struct clientparam* param) {
  }
  
  if(param->srv->requirecert > 1){
-    res = tlstobufsrv(param, 0);
+    res = tlstobufsrv(param);
     if(res <= 0 || param->srvbuf[0] != 22) RETURN(340-res);
     lv = param->srvbuf[2];
     res = parsehello(2, param->srvbuf, (unsigned)res, sni, &snipos, &lv, proto);
@@ -234,7 +234,7 @@ void * tlsprchild(struct clientparam* param) {
 	len = param->srvinbuf;
 	if(socksend(param, param->clisock, param->srvbuf,len, conf.timeouts[STRING_S]) != len) RETURN(371);
 	param->srvinbuf = 0;
-	res = tlstobufsrv(param, 0);
+	res = tlstobufsrv(param);
 	if(res <= 0) RETURN(380-res);
 	if(param->srvbuf[0]!= 22) break;
 	switch(param->srvbuf[5]){
@@ -256,7 +256,7 @@ void * tlsprchild(struct clientparam* param) {
     if(param->srv->requirecert > 3){
 	if(!reqcert) RETURN(374);
     	for(done=0;!done;) {
-	    res = tlstobufcli(param, 0);
+	    res = tlstobufcli(param);
 	    if(res <= 0) RETURN(390-res);
 	    len = res;
 	    if(param->clibuf[0]!= 22) break;