Updates for JRuby