Some template fixes