Build fixes after the last size_t batch.