Changes to items for cleaner processing