Template revisions due to schema changes

Fixed template validation errors due to revisions that were made to the
schemas.