pointer fixes
pointer fixes