Pointer fixes