Fix Map/List object decoding