More server init fixes