Two IPv6 related fixes

Handle IPv6 only clusters better.