Fixed a couple of bugs around the regex's in CSV IO