Fixed issues, jruby etc