DB/SAI: Some SAI updates to remove dup aura errors and some additions.