Made changes to the way the serverId is loaded