Fix CSV issues