Bundler update and fixes to solve Bundler dependencies