Tweaks to finalize() task