Final tweaks before sign-off