Minor chanhes to deal with Gemfile conflict issues