More database updates.
Fix up some small issues.