Inventory transfers and other fixes