Minor template changes & fixes