diff --git a/Dockerfile b/Dockerfile
index afb46577..fe920d8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,7 @@ EXPOSE 8000
 
 # CloudPebble stuff
 RUN npm install -g bower && echo '{"allow_root": true}' > ~/.bowerrc
-RUN npm install -g uglifyjs clean-css
+RUN npm install -g uglify-js clean-css
 
 # Grab the toolchain
 RUN curl -o /tmp/arm-cs-tools.tar https://cloudpebble-vagrant.s3.amazonaws.com/arm-cs-tools-stripped.tar && \
diff --git a/cloudpebble/settings.py b/cloudpebble/settings.py
index 8b94103d..e3fcf8fa 100644
--- a/cloudpebble/settings.py
+++ b/cloudpebble/settings.py
@@ -8,6 +8,8 @@
 
 DEBUG = _environ.get('DEBUG', '') != ''
 
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
 ADMINS = (
     ('Administrator', 'example@example.com'),
 )
@@ -90,7 +92,7 @@
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/var/www/example.com/static/"
-STATIC_ROOT = 'staticfiles'
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
 
 # URL prefix for static files.
 # Example: "http://example.com/static/", "http://static.example.com/"
@@ -353,7 +355,7 @@
         }
     },
     'loggers': {
-        'django': {
+        '*': {
             'handlers': ['console'],
             'level': 'DEBUG',
             'propagate': False