more rspec compat fixes