Fix up how the server is started