Database format tweaks