Several fixes for units with toggable state