Fixing `grunt build` and `grunt server:dist` targets