Fixed styles and rspec deprecations