Changes made for latest JRuby version