A variety of tweaks (including db changes)