Should fix all the database errors