Adjust regexps