bug fixes; support new version of jruby