Fixes for support and handling of toggling support across a single agent