bugfixes for hostnames