A couple of templtate tweaks