Simulator fixes