Minor updates for RVM