Fix unique collection fixes