More rvm fixes