diff --git a/src/libsodium/randombytes/randombytes.c b/src/libsodium/randombytes/randombytes.c
index 314e9d02..b74719b1 100644
--- a/src/libsodium/randombytes/randombytes.c
+++ b/src/libsodium/randombytes/randombytes.c
@@ -1,22 +1,22 @@
 
-#ifdef __EMSCRIPTEN__
-# include <emscripten.h>
-#endif
-
 #include <sys/types.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <stdint.h>
 
+#ifdef __EMSCRIPTEN__
+# include <emscripten.h>
+#endif
+
 #include "randombytes.h"
 #include "randombytes_sysrandom.h"
 
-#ifdef __EMSCRIPTEN__
-static const randombytes_implementation *implementation = NULL;
-#else
+#ifndef __EMSCRIPTEN__
 static const randombytes_implementation *implementation =
     &randombytes_sysrandom_implementation;
+#else
+static const randombytes_implementation *implementation = NULL;
 #endif
 
 int
@@ -68,7 +68,7 @@ randombytes_stir(void)
                     var crypto = require('crypto');
                     var randomValueIOJS = function() {
                         var buf = crypto.randomBytes(4);
-                        return (buf[0] << 24 | buf[1] << 16 || buf[2] << 8 || buf[3]) >>> 0;
+                        return (buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]) >>> 0;
                     };
                     randomValueIOJS();
                     Module.getRandomValue = randomValueIOJS;
diff --git a/test/default/randombytes.c b/test/default/randombytes.c
index db406202..a518ded9 100644
--- a/test/default/randombytes.c
+++ b/test/default/randombytes.c
@@ -36,6 +36,7 @@ static int randombytes_tests(void)
 #endif
     randombytes(x, 1U);
     while (randombytes_random() <= (uint32_t) 0x7fffffff);
+    while (randombytes_random() >= (uint32_t) 0x128);
     randombytes_close();
 
     for (i = 0; i < 256; ++i) {