Logic fixes in VanillaProvider (ids, not meta!), small change in @mod