DB/SAI: Kill more startup errors