Fixes for system rspec