Fixes against RSpec 3