Limited vendor trust

Other Faire issues: