verify Fixing some templating issues.