Make csv parser more robust.
Fix build. Make Directory check order agnostic.