Data dupe fixes