fix a few regexps