Accommodate pending tempest and coi changes