Some small changes to call template.