diff -r 349489ad0ecb common/stream/stream.c
--- a/common/stream/stream.c	Mon May 09 16:28:17 2016 +0200
+++ b/common/stream/stream.c	Tue May 24 15:51:25 2016 +0530
@@ -2113,7 +2113,7 @@
 #ifdef _MSC_VER
 		    WSAGetLastError() == WSAEWOULDBLOCK &&
 #else
-		    (errno == EAGAIN || errno == EWOULDBLOCK) && /* it was! */
+		    (errno == EAGAIN) && /* it was! */
 #endif
 		    s->timeout_func != NULL && /* callback function exists */
 		    !(*s->timeout_func)())     /* callback says don't stop */
@@ -2139,7 +2139,7 @@
 #ifdef _MSC_VER
 		    WSAGetLastError() == WSAEWOULDBLOCK
 #else
-		    (errno == EAGAIN || errno == EWOULDBLOCK)
+		    (errno == EAGAIN)
 #endif
 			)
 			s->errnr = MNSTR_TIMEOUT;
diff -r 349489ad0ecb monetdb5/mal/mal_module.c
--- a/monetdb5/mal/mal_module.c	Mon May 09 16:28:17 2016 +0200
+++ b/monetdb5/mal/mal_module.c	Tue May 24 15:51:25 2016 +0530
@@ -510,8 +510,8 @@
 					maxhelp+= MAXHELP;
 				}
 			}
-			m= m->sibling;
-		}
+		m= m->sibling;
+	  }
 	}
 	GDKfree(pat);
 	return msg;
diff -r 349489ad0ecb monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c	Mon May 09 16:28:17 2016 +0200
+++ b/monetdb5/modules/atoms/inet.c	Tue May 24 15:51:25 2016 +0530
@@ -407,7 +407,7 @@
 		unsigned char m[4];
 
 		if (val2->mask > 0)
-			mask = ~0 << (32 - val2->mask);
+		  mask = (unsigned int)(~0) << (32 - val2->mask);
 		else
 			mask = 0;
 
@@ -499,7 +499,7 @@
 		unsigned char m[4];
 
 		if (val->mask > 0)
-			mask = ~0 << (32 - val->mask);
+		  mask = (unsigned int)(~0) << (32 - val->mask);
 		else
 			mask = 0;
 
@@ -591,7 +591,7 @@
 		unsigned char m[4];
 
 		if (val->mask > 0)
-			mask = ~0 << (32 - val->mask);
+		  mask = (unsigned int)(~0) << (32 - val->mask);
 		else
 			mask = 0;
 
@@ -652,7 +652,7 @@
 		unsigned char m[4];
 
 		if (val->mask > 0)
-			mask = ~0 << (32 - val->mask);
+		  mask = (unsigned int)(~0) << (32 - val->mask);
 		else
 			mask = 0;
 
@@ -714,7 +714,7 @@
 		unsigned char m[4];
 
 		if (val->mask > 0)
-			mask = ~0 << (32 - val->mask);
+		  mask = (unsigned int)(~0) << (32 - val->mask);
 		else
 			mask = 0;
 		mask = ~mask;			/* invert the mask */
diff -r 349489ad0ecb monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c	Mon May 09 16:28:17 2016 +0200
+++ b/monetdb5/modules/atoms/json.c	Tue May 24 15:51:25 2016 +0530
@@ -529,7 +529,7 @@
 					else
 						r = 0;
 				} else if (terms[ti + 1].token == END_STEP) {
-					if (jt->elm[i].kind == JSON_VALUE || jt->elm[i].kind == JSON_VALUE)
+					if (jt->elm[i].kind == JSON_VALUE)
 						r = JSONgetValue(jt, jt->elm[i].child);
 					else
 						r = JSONgetValue(jt, i);
diff -r 349489ad0ecb sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c	Mon May 09 16:28:17 2016 +0200
+++ b/sql/backends/monet5/sql_execute.c	Tue May 24 15:51:25 2016 +0530
@@ -668,7 +668,7 @@
 			msg = createException(SQL,"RAstatement","Program contains errors");
 		else 
 			addQueryToCache(c);
-			SQLrun(c,m);
+		SQLrun(c,m);
 		if (!msg) {
 			resetMalBlk(c->curprg->def, oldstop);
 			freeVariables(c, c->curprg->def, NULL, oldvtop);
diff -r 349489ad0ecb sql/backends/monet5/vaults/netcdf/netcdf.c
--- a/sql/backends/monet5/vaults/netcdf/netcdf.c	Mon May 09 16:28:17 2016 +0200
+++ b/sql/backends/monet5/vaults/netcdf/netcdf.c	Tue May 24 15:51:25 2016 +0530
@@ -334,7 +334,7 @@
                         "Cannot read attribute %d of variable %d: %s",
                         aidx, vidx, nc_strerror(retval));
 
-	            if ((retval = nc_inq_att(ncid,vidx,aname,&atype,&alen)))
+		if ((retval = nc_inq_att(ncid,vidx,aname,&atype,&alen)))
                     return createException(MAL, "netcdf.attach",
 	                    "Cannot read attribute %s type and length: %s",
 	                    aname, nc_strerror(retval));
diff -r 349489ad0ecb sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c	Mon May 09 16:28:17 2016 +0200
+++ b/sql/server/sql_mvc.c	Tue May 24 15:51:25 2016 +0530
@@ -1624,7 +1624,7 @@
 		if (v->vtype == TYPE_bit) 
 			if (v->val.btval)
 				return 1;
-			return 0;
+		return 0;
 	}
 	return 0;
 }