Fix StockStatus some more