Use some more size_t