Two more places where we need to potentially generate invokes