Fix sonars in apex-pdp