[#874153] Some review fixes.