Fix some template inheritence problems.