Toggle fixes