Fix the issues with the grunt build