more finalization improvements