dbm/WIP: Minor tweaks