Grunt fixes needed for previous feedback commit.