Fixed db.xml issues