More template modifications.