Tweak pattern regexes