fixes for dbstructure