More fixes for dynamic invokes