Tweaks to how wildcards are processed