Fix support for uint32 and uint64.