Fix some templates