Additional gemfile and fix