Fix typos in tag definitions. Add clock persist