Fix up some regexps