Fix array/map deserialization