Small invoke improvements