More fixes for updated invoke