MAP-911, MAP-921: more fixes.