Merge in server-id fix