some updates to the host name handling