Fix DAO entities