fixes for host names