[#3028] more review fixes.