Better support for JRuby