Fix issues with booth templates