Fix grunt problems