Fix types and allow compiling on 32bits
This tag has no release notes.