Fix ntohs and ntohs mappings