More improvements to /db/.