More review fixes