Better jRuby support