Fixing a few template rendering issues.