App policy fixes