Fix bundler and encoding.