Fix for rspec system deprecations