AOSPA fixes