Fixes with NVM