Little templates corrections