AoB can equip Trusty + other minor improvements