Minor Changes in Template Handling