diff --git a/src/fileWatch.js b/src/fileWatch.js
index c5ad623..4ae6ea9 100644
--- a/src/fileWatch.js
+++ b/src/fileWatch.js
@@ -15,13 +15,14 @@ export async function setupWatch(signaller) {
 
     const watch = new CheapWatch({
         dir: config.get("scriptsFolder"),
-        filter: fileFilter
+        filter: fileFilter,
+        watch: !config.get("dry")
     });
 
     if(!config.get("quiet")) console.log("Watching folder", resolve(config.get("scriptsFolder")))
 
-    watch.on('+', fileEvent => signaller.emit(EventType.FileChanged, fileEvent));
-    watch.on('-', fileEvent => signaller.emit(EventType.FileDeleted, fileEvent));
+    watch.on('+', fileEvent => {if (fileEvent.stats.isFile()) signaller.emit(EventType.FileChanged, fileEvent)});
+    watch.on('-', fileEvent => {if (fileEvent.stats.isFile()) signaller.emit(EventType.FileDeleted, fileEvent)});
 
     // Wait 'till filewatcher is ready to go
     await watch.init();
diff --git a/src/networking/messageGenerators.js b/src/networking/messageGenerators.js
index 9885ecb..9f270b4 100644
--- a/src/networking/messageGenerators.js
+++ b/src/networking/messageGenerators.js
@@ -10,7 +10,7 @@ export function fileChangeEventToMsg({path}){
         "method":"pushFile",
         "params":{
             "server":"home",
-            "filename":path,
+            "filename":"/"+path,
             "content":readFileSync(join(config.get("scriptsFolder"), path)).toString()
         },
         "id":messageCounter++