Minor fixes.
Make the templates actually work.