Fixes in DAOs.
Merging conflicts.