Fixes for RSpec 3