diff --git a/api.coffee b/api.coffee
index 010804a..7f831a3 100644
--- a/api.coffee
+++ b/api.coffee
@@ -9,7 +9,7 @@ mongodb = require 'mongodb'
 TASKS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_\%]+)\/tasks\/?$/
 TAGS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_\%]+)\/tags\/([a-zA-Z0-9\-\_\%]+)\/?$/
 PRESETS_REGEX = /^\/presets\/([a-zA-Z0-9\-\_\%]+)\/?$/
-FILES_REGEX = /^\/files(\/[a-zA-Z0-9\-\_\%\ \.\/\(\)]+)\/?$/
+FILES_REGEX = /^\/files\/([a-zA-Z0-9\-\_\%\ \.\/\(\)]+)\/?$/
 
 connectionRequest = (deviceId, callback) ->
   db.devicesCollection.findOne({_id : deviceId}, {'InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value' : 1}, (err, device)->
@@ -228,11 +228,9 @@ else
             )
           )
         else if request.method == 'DELETE'
-          request.addListener('end', () ->
-            mongodb.GridStore.unlink(db.mongo.db, filename, (err) ->
-              response.writeHead(200)
-              response.end()
-            )
+          mongodb.GridStore.unlink(db.mongo.db, filename, (err) ->
+            response.writeHead(200)
+            response.end()
           )
         else
           response.writeHead 405, {'Allow': 'PUT, DELETE'}
diff --git a/files.coffee b/files.coffee
index 4767a2b..5f148fe 100644
--- a/files.coffee
+++ b/files.coffee
@@ -29,7 +29,7 @@ else
     urlParts = url.parse(request.url, true)
     if request.method == 'GET'
       request.addListener('end', () ->
-        gs = new mongodb.GridStore(db, urlParts.pathname, 'r', {})
+        gs = new mongodb.GridStore(db, urlParts.pathname.substring(1), 'r', {})
         gs.open((err, gs) ->
           if err
             response.writeHead(404)