adapt to latest dev changes in xosio