fix and upgrade access/policy subsystem