Update more host names
More fixes