Revise safety check (against TribeSettings) - was too aggressive previously (updates #11)