Some more tweaks to the dbyml