Post review fixes