A few more database-related tweaks.