AP fixes