Template improvements.