Some template modifications