other fixes for simulation