Fix inventory issues