[MAP] Fixes