minor changes related to MAPS from MAPS