Database fixes. There's daylight now :(