Gemfile updates and fix after upgrade