Fix issue with varying size_t values