Solving more template problems.