Changes to support other hosts.

Plus a few small tweaks.