Improve some regexes