APD-257: general refinements