PPLAN-1493: Minor updates due to review