more tweaks for hostnames