Changes to a few regexes