Small Grunt modifications