Minor changes to DAO.