Updated host name checks