some fixes to Grunt