Updating a few things from jruby branch