Finished some corrections on db_schema