Small template updates