DB/SAI: Fix errors in last commit.