Improvements for plugins + Base64 polyfill