Fixes for Grunt build.