Misc Gemfile fixes