Fix up whois stuff