Added more fixes to rvm