Updates to fix the setting of the default server and IP
merge