Correcting some Templates.