[#862832] Few more review fixes.