Small invocation changes