Add some missing code for SAE support