More memory map changes