Fixed broken db and schema