diff --git a/socket.c b/socket.c
index 939fa75f..2f564e8b 100644
--- a/socket.c
+++ b/socket.c
@@ -497,7 +497,7 @@ int bind_to_tcp(char *socket_name, int listen_queue, char *tcp_port) {
 
 	if (uwsgi.reuse_port) {
 #ifdef SO_REUSEPORT
-		if (setsockopt(serverfd, SOL_SOCKET, SO_REUSEPORT, (const void *) &reuse_port, sizeof(int)) < 0) {
+		if (setsockopt(serverfd, SOL_SOCKET, SO_REUSEPORT, (const void *) &uwsgi.reuse_port, sizeof(int)) < 0) {
 			uwsgi_error("setsockopt()");
 			uwsgi_nuclear_blast();
 		}
diff --git a/uploadtest.py b/uploadtest.py
index 4645edf5..4ab4863e 100644
--- a/uploadtest.py
+++ b/uploadtest.py
@@ -5,8 +5,9 @@ def application(env, start_response):
     	start_response('200 Ok', [('Content-type', 'text/plain')])
 	#for x in env['wsgi.input']:
 	#	yield x
-	body = env['wsgi.input'].readline()
-	print body
+	body = env['wsgi.input'].read(int(env['CONTENT_LENGTH']))
+	body += env['wsgi.input'].readline()
+	#print body
 	body += env['wsgi.input'].read(100)
 	body += env['wsgi.input'].read(100)
 	body += env['wsgi.input'].read()
@@ -17,7 +18,7 @@ def application(env, start_response):
 <form method="POST" enctype="multipart/form-data">
 	<textarea name="pluto">
 	</textarea>
-    <input type="test" name="pippo" />
+    <input type="file" name="pippo" />
     <input type="submit" value="invia" />
 </form>
         """
diff --git a/utils.c b/utils.c
index 18e1def2..a3e3c980 100644
--- a/utils.c
+++ b/utils.c
@@ -2392,7 +2392,7 @@ int *uwsgi_attach_fd(int fd, int count, char *code, size_t code_len) {
 		ret[i] = -1;
 	}
 
-	if ((cmsg->cmsg_len - ((char *)CMSG_DATA(cmsg)- (char *)cmsg)) > (sizeof(int) * (count + 1))) {
+	if ((size_t) (cmsg->cmsg_len - ((char *)CMSG_DATA(cmsg)- (char *)cmsg)) > (size_t) (sizeof(int) * (count + 1))) {
 		uwsgi_log("not enough space for sockets data, consider increasing it\n");
 		return NULL;	
 	}