Fix exported varying bug & backwards compatibility.