Regexes fixed