Fix Database

We sure are doing a lot of fixing.