Fixing some template classes.