DB/SAI: Fix startup errors