Even more inventory improvements