Last little updates before first client