DB/Misc: 2 updates to fix non working SAI scripts

Closes #9460