add cf2nand fixes from #2892