Various small changes to templates