diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile
index 33d43666f..1d103c9dd 100644
--- a/UI/WebServerResources/GNUmakefile
+++ b/UI/WebServerResources/GNUmakefile
@@ -5,12 +5,17 @@ include ../common.make
 WEBSERVER_RESOURCE_DIRS = css fonts img js
 
 build-static-files:
+	npm install --production
+	@if [ ! -e angular-material/src ]; then \
+	  git submodule init; \
+	fi
+	git submodule update
 	@if [ -d bower_components ]; then \
 	  bower update --allow-root; \
 	else \
 	  bower install --allow-root; \
 	fi
-	grunt build
+	grunt --stack build
 
 all :: build-static-files
 
diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index 11eed7aff..6327a4d71 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -36,7 +36,7 @@ module.exports = function(grunt) {
         options: {
           map: false,
           processors: [
-            require('autoprefixer-core')({browsers: '> 1%, last 2 versions, last 3 Firefox versions'}).postcss,
+            require('autoprefixer-core')({browsers: '> 1%, last 2 versions, last 3 Firefox versions'}),
             // minifier
             require('csswring').postcss
           ]
@@ -48,7 +48,7 @@ module.exports = function(grunt) {
         options: {
           map: true,
           processors: [
-            require('autoprefixer-core')({browsers: '> 1%, last 2 versions, last 3 Firefox versions'}).postcss
+            require('autoprefixer-core')({browsers: '> 1%, last 2 versions, last 3 Firefox versions'})
           ]
           // We may consider using css grace (https://github.com/cssdream/cssgrace) for larger support