Fixing nat stuff