Privacy Guard

Fixes for AOSCP