server address improvements