[#867441] Some review fixes.