More fixes for MapFieldType