Fixes for removing MapType