Jruby improvements