Patches to templates redone.