Tweaks for template alignment