Fix types

Some types didn't match and complained, especially on 32bit systems.
1 job for v2 in 1 minute and 52 seconds
latest
Status Job ID Name Coverage
  Test
passed #3695
test

00:01:52