Fixed some simple templating issues.