Changes for jruby