dao fixes