Few consistency changes for UpdateServer script