Minor setup for templates and typos