Template rendering improvements.