XXX more dbdma fixes