Simulator fixes and updates