More JRuby fixes