Fix issues with templates