DB/SAI: Fix few startup errors after 96b3df2