1.4: Improve/fix inventory upload