Another CSV fix + get rid of derive dependency