uint32_t -> uint64_t in some places