Fix warnings in CNAT code