Fix generation issue with 32 bit clients and large numbers/strings