Fix up some more regexps