More grunt fixes