Fix grunt issues