finalization fixes