whitespace, hostname generation fixups