Fixes for Content in templates.