Template corrections