New edits from nvram_bench