Updates for JRuby/RBX support