Fixes for JRUBY-7058