Fixing template usage, some overrides not necessary