Fix host/hostname normalization