Final jruby changes