Finalized fixes to 26785.