Tweaks to simplify Gemfile