Fix all the grunt problems!