More review fixes.