Fix toggle part of DoToggleableCommand and 2 more commands