More changes to env.rb