[FIX] Few bugs related to item sync