More CSV changes to accomodate Windows retardation.