various dao fixes