More fixes to prevent item duplications