AOSPA project
AOSPA fixes