Report and csv fix