Some more finalization edits.