Fix issues with Eero templates