DB/SAI: Fix startup DB errors