Debut & Panopoly tweaks