Fix build, add in PMEM possibility