Merge "More finalization script fixes."