Some template fixes.