Fix compilation. Finish InventoryWorkaround update.