more pointer fixes