Make fixes in SNAT code