Fix a few more breakages from our recent changes to the server_id