Fixing DB stuff...