Database fixes.
Think we're ready for a new release.