DBM + Raven tweaks