PS-15: Post review fixes