Fix up memory map