Tweak wildcards, recompile with latest refs