More ip address fixes