Fixed some bundler dependency issues