Cleanups.
Misc whois fixes.