Merge pull request #1519 from tobytailor/nat

Misc fixes
Make sure clip values are getting updated