more nat tweaks