Final template check fixes