More compatible polyfills