More fixes for GPSNav block.