Fixing up invocation issues