Gemfile/spec tweaks