DB issues fixed