Fixing RVM and NVM thingies