more fixes for rvm