Bug fixes for template list stuff.