GATEWAY-3180: bugfixes for pd standard.
GATEWAY-3371: addressing cr comment.
GATEWAY-3180: final minor clean up.