Fixed order/items errors