Bug fixes regarding market data