[#877808] Review fixes.