minor toggle fixes