setup.rb fixes