Small template changes