Fix some dupe bugs