more ongoing SAE-driven changes (too many too list here)