One or two changes in DAO out of pure boredom.
Merge origin/master