Fix NVM_DIR discovery