more function pointer fixes