Fixing some template issues