More fixes to the regexes