PS-10: Post review fixes
PS-13: Post review fixes