Datadump tables fix