Fix unique property errors