Fixes for RSpec 2.14.