NMAP2, GPMAP, GPSCAT updates/fixes for ASCT_HI