diff --git a/overlay_server.js b/overlay_server.js
index db323a6..5d4985f 100644
--- a/overlay_server.js
+++ b/overlay_server.js
@@ -1,11 +1,13 @@
+const path = require('path')
+
 if (process.env['config-file-path'] === undefined) {
-  process.env['config-file-path'] = 'config.json';
+  process.env['config-file-path'] = path.join(__dirname, 'config.json');
 }
 const loki_middlewares = require('./middlewares.js');
 const platform_middlewares = require('./server/middlewares.js');
 const apps = require('./server/app.js');
 
-const enableDebug = false
+const enableDebug = !!process.env['DEBUG']
 if (enableDebug) {
   apps.publicApp.use(platform_middlewares.debugMiddleware);
   // Express 4.x specific
diff --git a/server b/server
index 9307e4f..9d34fd8 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 9307e4f8d30bc6e9d6a9a27cb8d20c68dbc85729
+Subproject commit 9d34fd8ee004442b040a4498a7e5a40d2a860e89