Fix dupe bugs.