daos fixes from prev commit and wrappers for ints