Fixed some regexes