diff --git a/bin/firmwaremaker.js b/bin/firmwaremaker.js
index 9f7758ee5..1c2d9cb77 100755
--- a/bin/firmwaremaker.js
+++ b/bin/firmwaremaker.js
@@ -57,7 +57,7 @@ function fileGetter(url) {
 
 Promise.all(APPS.map(appid => {
   try {
-    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "metadata.json").toString());
+    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "/metadata.json").toString());
   } catch (e) {
     throw new Error(`App ${appid} not found`);
   }
@@ -77,6 +77,7 @@ Promise.all(APPS.map(appid => {
       js += `\x10if (E.CRC32(require('Storage').read(${JSON.stringify(file.name)}))!=${file.crc}){console.log("${file.name} invalid");FAIL++}\n`;
     }*/
   });
+  // js = js.replace(/\x10/g,""); // remove the echo-off characters (for testing only)
   fs.writeFileSync(OUTFILE, js);
   console.log("Output written to "+OUTFILE);
 });
diff --git a/bin/firmwaremaker_c.js b/bin/firmwaremaker_c.js
index e7042d2c3..7940e551d 100755
--- a/bin/firmwaremaker_c.js
+++ b/bin/firmwaremaker_c.js
@@ -133,7 +133,7 @@ function evaluateFile(file) {
 
 Promise.all(APPS.map(appid => {
   try {
-    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "metadata.json").toString());
+    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "/metadata.json").toString());
   } catch (e) {
     throw new Error(`App ${appid} not found`);
   }