Fix up inventory management