Yet more inventory improvements