Fix dup problems.