Finalization tweaks