unique pointer fixes