fixing all unsupported map/set types