Fix minor issues/deprecations with rspec v3