Fix CSV tools