Fix some templating