Fix up duplicate entries