more fixes for dap demo