Grunt improvements