more finalization fixes