initial fixes for jruby
fixing jruby builds
merging