[DB] Fixed some DB Errors introduced in Rel19