Changed protection of a few templates to private.