Removed more item_type clashes