Final tweaks before the first launch