More changes, but creating a server now works again