Work towards fixing the DMAs

This might be ok, I’m just too unsure to call this a fix