Fixed polyfill problems