some Dace fixes