More size_t fixes