Fix some issues in the statging shops.