Fix some regexps