Some NAT fixes