More improvements of the startup