Solved two issues (FIXME) with the new DAO class.