Some csv exported fixes