Fixed more templetes.