Fixing Server Addresses