Updates for JRuby support.