exp: fix issues around int vs size_t