MAP-1036: minor changes