Dupe fixes, other fixes