a couple of small base template adjustments