Fixed some grunt bugs