More minor base template tweaks