Remove usage of uint32_t