Fixed some toggle state issues.