[UPDATE] fix some polyfill issues