Small template fixes.