[#880714] Review fixes.