A few more places needed `ifdef SIMULATION