Db/SAI: Fix some errors found by Aokromes.