Attempt to unbreak the nat type detection.
Merge pull request #207 from whirm/nat_fixes

Attempt to unbreak the nat type detection.