Fix more duplicates