Bug fixes round one for IPv6