Use 32bit numbers in more places