More updates to SAI hints