Memory Simulation fixes