Fix up the server