Last run at fixing the jruby 2.0 stuff