Improve NVM_DIR stuff