Fix polyfills