Fix some deprecation warnings when run under RSpec 2.99