Ap fixes