diff --git a/packages/hot-module-replacement/server.js b/packages/hot-module-replacement/server.js
index a6d7d5122a..2f3b8462e2 100644
--- a/packages/hot-module-replacement/server.js
+++ b/packages/hot-module-replacement/server.js
@@ -1,4 +1,3 @@
-// METEOR_PARENT_PID 
 if (process.env.METEOR_HMR_SECRET) {
   __meteor_runtime_config__._hmrSecret = process.env.METEOR_HMR_SECRET;
 } else if (process.env.METEOR_PARENT_PID) {
diff --git a/tools/fs/files.ts b/tools/fs/files.ts
index d259204052..432b210def 100644
--- a/tools/fs/files.ts
+++ b/tools/fs/files.ts
@@ -1432,6 +1432,9 @@ export function readBufferWithLengthAndOffset(
       if (count !== length) {
         throw new Error("couldn't read entire resource");
       }
+    } catch (err: any) {
+      err.message = `Error while reading ${filename}: ` + err.message;
+      throw err;
     } finally {
       close(fd);
     }
diff --git a/tools/isobuild/unibuild.js b/tools/isobuild/unibuild.js
index 77c9410b2f..fafb7a8543 100644
--- a/tools/isobuild/unibuild.js
+++ b/tools/isobuild/unibuild.js
@@ -153,7 +153,10 @@ export class Unibuild {
           usesDefaultSourceProcessor: true,
           legacyPrelink: {
             packageVariables: unibuildJson.packageVariables || []
-          }
+          },
+          // Only published packages still use prelink resources,
+          // so there is no need to mark this file to be watched
+          _dataUsed: false
         };
 
         if (resource.sourceMap) {
diff --git a/tools/packaging/tropohouse.js b/tools/packaging/tropohouse.js
index 65c3af4c08..f63e3e30aa 100644
--- a/tools/packaging/tropohouse.js
+++ b/tools/packaging/tropohouse.js
@@ -29,9 +29,6 @@ var defaultWarehouseDir = function () {
 
   var warehouseBase = files.inCheckout()
      ? files.getCurrentToolsDir() : files.getHomeDir();
-  // XXX This will be `.meteor` soon, once we've written the code to make the
-  // tropohouse and warehouse live together in harmony (eg, allowing tropohouse
-  // tools to springboard to warehouse tools).
   return files.pathJoin(warehouseBase, ".meteor");
 };