More Template corrections