Price and simulator fixes