MAP-954: more fixes.