DB structure and dump fix