Database tweaks