Minor updates for JRuby