Fixed some regexps