Minor template chanes