diff --git a/packages/core-runtime/load-js-image.js b/packages/core-runtime/load-js-image.js
index 15ce5cd7b1..029c9f2edb 100644
--- a/packages/core-runtime/load-js-image.js
+++ b/packages/core-runtime/load-js-image.js
@@ -122,7 +122,7 @@ function checkAsyncModule (exports) {
 // For this to be accurate, all linked files must be queued before calling this
 // If all are loaded, returns null. Otherwise, returns a promise
 function waitUntilAllLoaded() {
-  if (pending.length === 0) {
+  if (pending.length === 0 && !isProcessing) {
     // All packages are loaded
     // If there were no async packages, then there might not be a promise
     // polyfill loaded either, so we don't create a promise to return
diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 4f15f4033c..cd51d01d7e 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -61,7 +61,7 @@ const hasOwn = Object.prototype.hasOwnProperty;
 // Cache the (slightly post-processed) results of linker.fullLink.
 const CACHE_SIZE = process.env.METEOR_LINKER_CACHE_SIZE || 1024*1024*100;
 const CACHE_DEBUG = !! process.env.METEOR_TEST_PRINT_LINKER_CACHE_DEBUG;
-const LINKER_CACHE_SALT = 25; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 26; // Increment this number to force relinking.
 const LINKER_CACHE = new LRU({
   max: CACHE_SIZE,
   // Cache is measured in bytes. We don't care about servePath.