diff --git a/Site/mpw-js/js/dependencies.js b/Site/mpw-js/js/dependencies.js
index 661ae016..78b23676 100644
--- a/Site/mpw-js/js/dependencies.js
+++ b/Site/mpw-js/js/dependencies.js
@@ -8,9 +8,14 @@ if ((!window.crypto || !window.crypto.subtle) && window.SubtleCrypto)
 // https://code.google.com/p/crypto-js/
 if (!window.crypto || !window.crypto.subtle) {
     document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/hmac-sha256.js><\/script>");
+    document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/pbkdf2.js><\/script>");
     document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/lib-typedarrays-min.js><\/script>");
 }
 
+if (!Number.MAX_SAFE_INTEGER) {
+    Number.MAX_SAFE_INTEGER = Math.pow(2, 53) - 1;
+}
+
 // If Typed Arrays are not supported we include the polyfill
 // https://github.com/inexorabletash/polyfill
 window.ArrayBuffer || document.write("<script src=js/typedarray-polyfill.js><\/script>");
@@ -40,7 +45,7 @@ try {
 ES6 || document.write("<script src=js/mpw-js/traceur-runtime.js><\/script>");
 
 // Include the scrypt implementation
-var SCRYPTASM_PATH = (window.location + '').replace(/[^/]*(#[^#]*)?$/, 'js/mpw-js/scrypt-asm.js');
+document.write("<script src=lib/" + esdir + "pbkdf2.js><\/script>");
 document.write("<script src=js/mpw-js/" + esdir + "scrypt.js?1><\/script>");
 
 // Include the MPW class
diff --git a/Site/mpw-js/js/mpw-js b/Site/mpw-js/js/mpw-js
index 9566261e..5972a1c8 160000
--- a/Site/mpw-js/js/mpw-js
+++ b/Site/mpw-js/js/mpw-js
@@ -1 +1 @@
-Subproject commit 9566261e5d9815b5974683efc6648a751cfb4014
+Subproject commit 5972a1c80f9bc721e79e5c218057143ade4acf68
diff --git a/Site/mpw-js/js/setImmediate-polyfill.js b/Site/mpw-js/js/setImmediate-polyfill.js
index 2bd1ec20..b4a5fe4e 100644
--- a/Site/mpw-js/js/setImmediate-polyfill.js
+++ b/Site/mpw-js/js/setImmediate-polyfill.js
@@ -195,9 +195,9 @@ window.setImmediate || !function (global) {
 		};
 	}
 	
-	// The worst fallback is setImmediate, although the delay is set to 0
-	// in reality this should have a ~20ms delay, this is an important part
-	// of the spec
+	// The worst fallback is setTimeout, although the delay is set to 0,
+	// in reality this should have a ~20ms delay as this is an important
+	// part of the spec
 	attachTo.setImmediate = (func, ...params) => global.setTimeout(func, 0, ...params);
 	attachTo.clearImmediate = global.clearTimeout;
 	
@@ -208,4 +208,4 @@ window.setImmediate || !function (global) {
 		// the arguments
 		arg || (attachTo.setImmediate = (func, ...params) => global.setTimeout(() => func(...params), 0));
 	}, 0, true);
-}(this);
\ No newline at end of file
+}(this || window);