[#3028] More review fixes.