some more int -> size_t changes