Fixed grunt issues