PIM-3237: FIx PR comments