Minor improvements to the basic templates.