More fixes on IPv6 code