Some fixes to the item