Fixes in nat mapper module
Fixes in nat mapper module