Support newer RVM