Fix regexes