More toggle tweaks