More Funcptr Updates