Further template variable fixes.