Further grunt modifications