Fixes for rspec 2.19