Fix back fixes for #1133 from Async-Sim.