Some DAO and Time fixes/changes