Fix erroring out
Merge branch 'master' into dma