Further fixes in profiles templates
Further fixes to profiles templates.