Small database tweaks