Further database tweaks.