Added fix for template warnings