Fix for Ruby 2.0
Improve environments