More toggle fixes