diff --git a/app/core/ModuleLoader.coffee b/app/core/ModuleLoader.coffee
index 433357743..dbf4f03d3 100644
--- a/app/core/ModuleLoader.coffee
+++ b/app/core/ModuleLoader.coffee
@@ -72,7 +72,7 @@ module.exports = ModuleLoader = class ModuleLoader extends CocoClass
       @trigger 'load-complete'
       
   parseDependencies: (raw) ->
-    bits = raw.match(/(require\(\'([^)]+)\')|(register\(\".+\")/g) or []
+    bits = raw.match(/(require\(['"](.+?)['"])|(register\(['"].+?['"])/g) or []
     rootFolder = null
     dependencies = []
     for bit in bits
diff --git a/app/views/editor/PatchesView.coffee b/app/views/editor/PatchesView.coffee
index fbaa916a5..576cb6175 100644
--- a/app/views/editor/PatchesView.coffee
+++ b/app/views/editor/PatchesView.coffee
@@ -1,7 +1,7 @@
 CocoView = require 'views/core/CocoView'
 template = require 'templates/editor/patches'
 PatchesCollection = require 'collections/PatchesCollection'
-nameLoader = require 'lib/NameLoader'
+nameLoader = require 'core/NameLoader'
 PatchModal = require './PatchModal'
 
 module.exports = class PatchesView extends CocoView
diff --git a/app/views/modal/VersionsModal.coffee b/app/views/modal/VersionsModal.coffee
index 3358a2cc0..4bf9b85a6 100755
--- a/app/views/modal/VersionsModal.coffee
+++ b/app/views/modal/VersionsModal.coffee
@@ -2,7 +2,7 @@ ModalView = require 'views/core/ModalView'
 template = require 'templates/modal/versions'
 DeltaView = require 'views/editor/DeltaView'
 PatchModal = require 'views/editor/PatchModal'
-nameLoader = require 'lib/NameLoader'
+nameLoader = require 'core/NameLoader'
 CocoCollection = require 'collections/CocoCollection'
 deltasLib = require 'core/deltas'
 
diff --git a/config.coffee b/config.coffee
index c0b8dfe5d..273627f5e 100644
--- a/config.coffee
+++ b/config.coffee
@@ -174,6 +174,8 @@ exports.config =
         no_unnecessary_fat_arrows:
           level: 'ignore'
     uglify:
+      mangle:
+        except: ['require']
       output:
         semicolons: false
     sass: