Fix some of my invocation stuff