Fix uniquify and use diminish