Fixes to Grunt