Minor improvements to the template