Minor changes and IPv6