More correct regexps