more wip fixes
Tweaks for jruby in 1.9 mode