Tune and fix templates;