Finalization tweaks - now we can be proud of it :)