More finalization improvements