fix some templates