More JRuby changes