AP11-102 more fixes