Dap dependencies

Make dependencies valid for dap, part of #274