More inventory fixes