Adjust for latest RSpec and various other things