Minor changes in Core\Template class.