diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index b0a940fe..6be78f68 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1596,7 +1596,7 @@ make_nonblocking_noninheritable (struct MHD_Daemon *daemon,
 #endif
     }
   if (!GetHandleInformation ((HANDLE) sock, &dwFlags) ||
-      ((dwFlags != dwFlags & ~HANDLE_FLAG_INHERIT) &&
+      ((dwFlags != (dwFlags & ~HANDLE_FLAG_INHERIT)) &&
        !SetHandleInformation ((HANDLE) sock, HANDLE_FLAG_INHERIT, 0)))
     {
 #if HAVE_MESSAGES
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index 9b234fea..08d20cee 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -148,7 +148,7 @@ MHD_http_unescape (void *cls,
 	  num = strtoul (buf3, &end, 16);
 	  if ('\0' == *end)
 	    {
-	      *wpos = (unsigned char) num;
+	      *wpos = (char)((unsigned char) num);
 	      wpos++;
 	      rpos += 3;
 	      break;