Fix gemfile dependency issues