Grunt fixes and updates