Merge DMA compile changes