Fixed template variable invocations