Small corrections before first launch