Minor template updates. Matches base better