minor primitive map improvements