Grunt build improvements