various fixes regarding new CSV adapter implementation