Fix db connectivity issues