Made some changes to reflect needs for remote host adoption.